slhaf/Partner
1
0
Fork 0
mirror of https://github.com/slhaf/Partner.git synced 2026-05-12 16:53:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(BuiltinCommand): expire finished command sessions by ttl

Browse Source
This commit is contained in:
slhafzjw
2026-04-19 17:26:20 +08:00
parent dd8e20838d
commit 8c8b0883bb
2 changed files with 156 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Partner-Core/src/main/java/work/slhaf/partner/module/action/builtin/BuiltinCommandActionProvider.java
View File

@@ -8,6 +8,7 @@ import work.slhaf.partner.core.action.runner.policy.ExecutionPolicyRegistry;
import work.slhaf.partner.core.action.runner.policy.WrappedLaunchSpec;
import java.time.Instant;
import java.time.Duration;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
@@ -21,6 +22,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
private static final int DEFAULT_READ_LIMIT = 4096;
private static final int SUMMARY_MAX_LINES = 5;
private static final int SUMMARY_MAX_LENGTH = 2048;
private static final Duration COMMAND_SESSION_TTL = Duration.ofMinutes(10);
private final Set<String> basicTags = Set.of("Builtin MetaAction", "System Command Tool");
@@ -93,6 +95,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
JSONObject.of("executionId", "Command execution session id.")
);
Function<Map<String, Object>, String> invoker = params -> {
cleanupExpiredHandles();
String desc = BuiltinActionRegistry.BuiltinActionDefinition.requireString(params, "desc");
List<String> commands = requireCommandArguments(params);
CommandExecutionService.CommandSession session = commandExecutionService.createSessionTask(wrapCommands(commands));
@@ -145,6 +148,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
)
);
Function<Map<String, Object>, String> invoker = params -> {
cleanupExpiredHandles();
CommandHandle handle = requireHandle(BuiltinActionRegistry.BuiltinActionDefinition.requireString(params, "id"));
return JSONObject.of(
"executionId", handle.executionId,
@@ -196,6 +200,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
)
);
Function<Map<String, Object>, String> invoker = params -> {
cleanupExpiredHandles();
CommandHandle handle = requireHandle(BuiltinActionRegistry.BuiltinActionDefinition.requireString(params, "id"));
String stream = BuiltinActionRegistry.BuiltinActionDefinition.optionalString(params, "stream", "stdout");
if (!"stdout".equals(stream) && !"stderr".equals(stream)) {
@@ -256,6 +261,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
)
);
Function<Map<String, Object>, String> invoker = params -> {
cleanupExpiredHandles();
CommandHandle handle = requireHandle(BuiltinActionRegistry.BuiltinActionDefinition.requireString(params, "id"));
if (handle.process.isAlive()) {
handle.process.destroy();
@@ -308,6 +314,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
)
);
Function<Map<String, Object>, String> invoker = params -> {
cleanupExpiredHandles();
List<JSONObject> items = commandHandles.values().stream()
.sorted(Comparator.comparing(handle -> handle.startAt))
.map(handle -> JSONObject.of(
@@ -338,6 +345,16 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
});
}
private void cleanupExpiredHandles() {
Instant now = Instant.now();
commandHandles.entrySet().removeIf(entry -> isExpired(entry.getValue(), now));
}
private boolean isExpired(CommandHandle handle, Instant now) {
Instant exitTime = handle.exitAt;
return exitTime != null && !exitTime.plus(COMMAND_SESSION_TTL).isAfter(now);
}
private WrappedLaunchSpec wrapCommands(List<String> commands) {
return ExecutionPolicyRegistry.INSTANCE.prepare(commands);
}