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

refactor(runner): inline command action JSON responses and remove command response DTOs

Browse Source
This commit is contained in:
slhafzjw
2026-03-21 18:14:47 +08:00
parent 809d38bd07
commit 1a83075031
1 changed files with 33 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,7 +116,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
/** /**
* 用于返回指定后台 Builtin MetaAction 的摘要内容 * 用于返回指定后台 Builtin MetaAction 的摘要内容
* *
* @return 内建 MetaAction 定义数据，参数为进程 id，返回值为摘要内容(CommandInspectData) * @return 内建 MetaAction 定义数据，参数为进程 id，返回值为摘要内容 JSON
*/ */
private BuiltinActionRegistry.BuiltinActionDefinition buildCommandInspectDefinition() { private BuiltinActionRegistry.BuiltinActionDefinition buildCommandInspectDefinition() {
Set<String> tags = new HashSet<>(basicTags); Set<String> tags = new HashSet<>(basicTags);
@@ -144,18 +144,17 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
); );
Function<Map<String, Object>, String> invoker = params -> { Function<Map<String, Object>, String> invoker = params -> {
CommandHandle handle = requireHandle(BuiltinActionRegistry.BuiltinActionDefinition.requireString(params, "id")); CommandHandle handle = requireHandle(BuiltinActionRegistry.BuiltinActionDefinition.requireString(params, "id"));
CommandInspectData data = new CommandInspectData( return JSONObject.of(
handle.executionId, "executionId", handle.executionId,
handle.desc, "desc", handle.desc,
handle.exitCode, "exitCode", handle.exitCode,
bufferLength(handle.stdoutBuffer), "stdoutSize", bufferLength(handle.stdoutBuffer),
bufferLength(handle.stderrBuffer), "stderrSize", bufferLength(handle.stderrBuffer),
summarizeBuffer(handle.stdoutBuffer), "stdoutSummary", summarizeBuffer(handle.stdoutBuffer),
summarizeBuffer(handle.stderrBuffer), "stderrSummary", summarizeBuffer(handle.stderrBuffer),
handle.startAt, "startAt", handle.startAt,
handle.exitAt "endAt", handle.exitAt
); ).toJSONString();
return toJson(data);
}; };
return new BuiltinActionRegistry.BuiltinActionDefinition(createActionKey("inspect"), info, invoker); return new BuiltinActionRegistry.BuiltinActionDefinition(createActionKey("inspect"), info, invoker);
} }
@@ -163,7 +162,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
/** /**
* 用于读取指定后台 Builtin MetaAction 的输出内容 * 用于读取指定后台 Builtin MetaAction 的输出内容
* *
* @return 内建 MetaAction 定义数据，参数为进程 id 与读取流(stdout/stderr)，返回值为读取内容(CommandReadData) * @return 内建 MetaAction 定义数据，参数为进程 id 与读取流(stdout/stderr)，返回值为读取内容 JSON
*/ */
private BuiltinActionRegistry.BuiltinActionDefinition buildCommandReadDefinition() { private BuiltinActionRegistry.BuiltinActionDefinition buildCommandReadDefinition() {
Set<String> tags = new HashSet<>(basicTags); Set<String> tags = new HashSet<>(basicTags);
@@ -217,17 +216,16 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
boolean truncated = nextOffset < snapshot.length(); boolean truncated = nextOffset < snapshot.length();
boolean eof = !handle.isRunning() && nextOffset >= snapshot.length(); boolean eof = !handle.isRunning() && nextOffset >= snapshot.length();
CommandReadData data = new CommandReadData( return JSONObject.of(
handle.executionId, "executionId", handle.executionId,
handle.desc, "desc", handle.desc,
stream, "stream", stream,
content, "content", content,
truncated, "contentTruncated", truncated,
safeOffset, "offset", safeOffset,
nextOffset, "nextOffset", nextOffset,
eof "eof", eof
); ).toJSONString();
return toJson(data);
}; };
return new BuiltinActionRegistry.BuiltinActionDefinition(createActionKey("read"), info, invoker); return new BuiltinActionRegistry.BuiltinActionDefinition(createActionKey("read"), info, invoker);
} }
@@ -285,7 +283,7 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
/** /**
* 用于列出全量后台进程的 Builtin MetaAction * 用于列出全量后台进程的 Builtin MetaAction
* *
* @return 内建 MetaAction 定义数据，无参数，返回值为后台进程集合(CommandOverviewItem) * @return 内建 MetaAction 定义数据，无参数，返回值为后台进程集合 JSON
*/ */
private BuiltinActionRegistry.BuiltinActionDefinition buildCommandOverviewDefinition() { private BuiltinActionRegistry.BuiltinActionDefinition buildCommandOverviewDefinition() {
Set<String> tags = new HashSet<>(basicTags); Set<String> tags = new HashSet<>(basicTags);
@@ -301,27 +299,20 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
Set.of(createActionKey("inspect"), createActionKey("read"), createActionKey("cancel")), Set.of(createActionKey("inspect"), createActionKey("read"), createActionKey("cancel")),
false, false,
JSONObject.of( JSONObject.of(
"result", "Array of command session overview items.", "commands", "Array of command session overview items.",
"result.executionId", "Command execution session id for each overview item.", "command.executionId", "Command execution session id for each overview item.",
"result.desc", "Command session description for each overview item.", "command.desc", "Command session description for each overview item.",
"result.exitCode", "Process exit code for each overview item. Null when still running." "command.exitCode", "Process exit code for each overview item. Null when still running."
) )
); );
Function<Map<String, Object>, String> invoker = params -> { Function<Map<String, Object>, String> invoker = params -> {
List<JSONObject> items = commandHandles.values().stream() List<JSONObject> items = commandHandles.values().stream()
.sorted(Comparator.comparing(handle -> handle.startAt)) .sorted(Comparator.comparing(handle -> handle.startAt))
.map(handle -> { .map(handle -> JSONObject.of(
CommandOverviewItem item = new CommandOverviewItem( "executionId", handle.executionId,
handle.executionId, "desc", handle.desc,
handle.desc, "exitCode", handle.exitCode
handle.exitCode ))
);
JSONObject json = new JSONObject();
json.put("executionId", item.executionId);
json.put("desc", item.desc);
json.put("exitCode", item.exitCode);
return json;
})
.toList(); .toList();
return JSONObject.of("result", items).toJSONString(); return JSONObject.of("result", items).toJSONString();
}; };
@@ -425,33 +416,6 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
} }
} }
private String toJson(CommandInspectData data) {
JSONObject result = new JSONObject();
result.put("executionId", data.executionId);
result.put("desc", data.desc);
result.put("exitCode", data.exitCode);
result.put("stdoutSize", data.stdoutSize);
result.put("stderrSize", data.stderrSize);
result.put("stdoutSummary", data.stdoutSummary);
result.put("stderrSummary", data.stderrSummary);
result.put("startAt", data.startAt);
result.put("endAt", data.endAt);
return result.toJSONString();
}
private String toJson(CommandReadData data) {
JSONObject result = new JSONObject();
result.put("executionId", data.executionId);
result.put("desc", data.desc);
result.put("stream", data.stream);
result.put("content", data.content);
result.put("contentTruncated", data.contentTruncated);
result.put("offset", data.offset);
result.put("nextOffset", data.nextOffset);
result.put("eof", data.eof);
return result.toJSONString();
}
@AllArgsConstructor @AllArgsConstructor
private static class CommandHandle { private static class CommandHandle {
private String executionId; private String executionId;
@@ -480,60 +444,4 @@ class BuiltinCommandActionProvider implements BuiltinActionProvider {
return exitCode == null && process.isAlive(); return exitCode == null && process.isAlive();
} }
} }
@AllArgsConstructor
private static class CommandInspectData {
private String executionId;
private String desc;
private Integer exitCode;
private int stdoutSize;
private int stderrSize;
/**
* stdout 摘要，v1 暂取头五行与最后五行，中间省略，最多 2k 字符; 如果内容过短则全取
*/
private String stdoutSummary;
/**
* stderr 摘要，v1 暂取头五行与最后五行，中间省略，最多 2k 字符; 如果内容过短则全取
*/
private String stderrSummary;
private Instant startAt;
private Instant endAt;
}
@AllArgsConstructor
private static class CommandReadData {
private String executionId;
private String desc;
private String stream;
/**
* 本次从指定 stream 中读取到的内容
*/
private String content;
private boolean contentTruncated;
/**
* 本次读取起点
*/
private int offset;
/**
* 下次读取起点
*/
private int nextOffset;
/**
* 读取是否已达末尾（进程退出、stream 及缓冲区均读取完毕)
*/
private boolean eof;
}
@AllArgsConstructor
private static class CommandOverviewItem {
private String executionId;
private String desc;
private Integer exitCode;
}
} }