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(LocalRunnerClient): introduce WatchContext and decouple build/processor state

Browse Source
This commit is contained in:
slhafzjw
2025-12-31 23:11:15 +08:00
parent a6e33edc7a
commit 64b907707a
1 changed files with 56 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Partner-Main/src/main/java/work/slhaf/partner/core/action/runner/LocalRunnerClient.java
View File

@@ -47,6 +47,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.stream.Stream;
import static work.slhaf.partner.common.util.PathUtil.buildPathStr; import static work.slhaf.partner.common.util.PathUtil.buildPathStr;
@@ -280,10 +281,6 @@ public class LocalRunnerClient extends RunnerClient {
})); }));
} }
private LocalWatchServiceBuild registerWatchService(Path path) {
return new LocalWatchServiceBuild.BuildRegistry(path, watchService, executor);
}
private interface LocalWatchServiceBuild { private interface LocalWatchServiceBuild {
LocalWatchServiceBuild registerCreate(EventHandler handler); LocalWatchServiceBuild registerCreate(EventHandler handler);
@@ -295,28 +292,25 @@ public class LocalRunnerClient extends RunnerClient {
LocalWatchServiceBuild initialLoad(InitLoader loader); LocalWatchServiceBuild initialLoad(InitLoader loader);
void commit(); LocalWatchServiceBuild watchAll(boolean watchAll);
void commit(ExecutorService executor);
interface EventHandler { interface EventHandler {
void handle(Path thisDir, Path context); void handle(Path thisDir, Path context);
} }
interface InitLoader { interface InitLoader {
void load(Path path); void load();
} }
class BuildRegistry implements LocalWatchServiceBuild { class BuildRegistry implements LocalWatchServiceBuild {
private final Map<WatchEvent.Kind<?>, EventHandler> handlers = new HashMap<>(); private final Map<WatchEvent.Kind<?>, EventHandler> handlers = new HashMap<>();
private final Path path;
private final WatchService watchService;
private final ExecutorService executor;
private InitLoader initLoader; private InitLoader initLoader;
private BuildRegistry(Path path, WatchService watchService, ExecutorService executor) { private BuildRegistry(WatchContext ctx) {
this.path = path; this.ctx = ctx;
this.watchService = watchService;
this.executor = executor;
} }
@Override @Override
@@ -357,12 +351,12 @@ public class LocalRunnerClient extends RunnerClient {
private Runnable buildWatchTask() { private Runnable buildWatchTask() {
return () -> { return () -> {
String pathStr = path.toString(); String pathStr = ctx.path.toString();
log.info("行动程序目录监听器已启动，监听目录: {}", pathStr); log.info("行动程序目录监听器已启动，监听目录: {}", pathStr);
while (true) { while (true) {
WatchKey key; WatchKey key;
try { try {
key = watchService.take(); key = ctx.watchService.take();
List<WatchEvent<?>> events = key.pollEvents(); List<WatchEvent<?>> events = key.pollEvents();
for (WatchEvent<?> e : events) { for (WatchEvent<?> e : events) {
WatchEvent.Kind<?> kind = e.kind(); WatchEvent.Kind<?> kind = e.kind();
@@ -394,12 +388,20 @@ public class LocalRunnerClient extends RunnerClient {
} }
} }
private sealed static abstract class LocalWatchServiceHelper permits LocalWatchServiceHelper.Dynamic, LocalWatchServiceHelper.Desc, LocalWatchServiceHelper.Common { private record WatchContext(Path path, WatchService watchService, Map<WatchKey, Path> watchKeys) {
private WatchContext(Path path, WatchService watchService) {
this(path, watchService, new HashMap<>());
}
}
private sealed static abstract class LocalWatchEventProcessor permits LocalWatchEventProcessor.Dynamic, LocalWatchEventProcessor.Desc, LocalWatchEventProcessor.Common {
protected final ConcurrentHashMap<String, MetaActionInfo> existedMetaActions; protected final ConcurrentHashMap<String, MetaActionInfo> existedMetaActions;
protected final WatchContext ctx;
private LocalWatchServiceHelper(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions) { private LocalWatchEventProcessor(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions, WatchContext ctx) {
this.existedMetaActions = existedMetaActions; this.existedMetaActions = existedMetaActions;
this.ctx = ctx;
} }
protected abstract @NotNull LocalWatchServiceBuild.InitLoader buildLoad(); protected abstract @NotNull LocalWatchServiceBuild.InitLoader buildLoad();
@@ -412,12 +414,12 @@ public class LocalRunnerClient extends RunnerClient {
protected abstract @NotNull LocalWatchServiceBuild.EventHandler buildOverflow(); protected abstract @NotNull LocalWatchServiceBuild.EventHandler buildOverflow();
private static final class Dynamic extends LocalWatchServiceHelper { private static final class Dynamic extends LocalWatchEventProcessor {
private final McpStatelessAsyncServer dynamicActionMcpServer; private final McpStatelessAsyncServer dynamicActionMcpServer;
private Dynamic(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions, McpStatelessAsyncServer dynamicActionMcpServer) { private Dynamic(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions, McpStatelessAsyncServer dynamicActionMcpServer, WatchContext ctx) {
super(existedMetaActions); super(existedMetaActions, ctx);
this.dynamicActionMcpServer = dynamicActionMcpServer; this.dynamicActionMcpServer = dynamicActionMcpServer;
} }
@@ -494,8 +496,12 @@ public class LocalRunnerClient extends RunnerClient {
@Override @Override
@NotNull @NotNull
protected LocalWatchServiceBuild.InitLoader buildLoad() { protected LocalWatchServiceBuild.InitLoader buildLoad() {
return path -> {
// 从该路径列出已存在的目录，每个目录对应不同的行动程序及描述文件，从描述文件加载程序信息 // 从该路径列出已存在的目录，每个目录对应不同的行动程序及描述文件，从描述文件加载程序信息
return this::load;
}
private void load() {
Path path = ctx.path;
File file = path.toFile(); File file = path.toFile();
if (file.isFile()) { if (file.isFile()) {
throw new ActionInitFailedException("未找到目录: " + path); throw new ActionInitFailedException("未找到目录: " + path);
@@ -520,7 +526,6 @@ public class LocalRunnerClient extends RunnerClient {
MetaActionInfo info = JSONUtil.readJSONObject(meta, StandardCharsets.UTF_8).toBean(MetaActionInfo.class); MetaActionInfo info = JSONUtil.readJSONObject(meta, StandardCharsets.UTF_8).toBean(MetaActionInfo.class);
addAction(dir.getName(), info, program); addAction(dir.getName(), info, program);
} }
};
} }
private McpStatelessServerFeatures.AsyncToolSpecification buildAsyncToolSpecification(MetaActionInfo info, File program, String actionKey, String name) { private McpStatelessServerFeatures.AsyncToolSpecification buildAsyncToolSpecification(MetaActionInfo info, File program, String actionKey, String name) {
@@ -626,12 +631,12 @@ public class LocalRunnerClient extends RunnerClient {
} }
} }
private static final class Desc extends LocalWatchServiceHelper { private static final class Desc extends LocalWatchEventProcessor {
private final McpStatelessAsyncServer mcpDescServer; private final McpStatelessAsyncServer mcpDescServer;
private Desc(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions, McpStatelessAsyncServer mcpDescServer) { private Desc(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions, McpStatelessAsyncServer mcpDescServer, WatchContext ctx) {
super(existedMetaActions); super(existedMetaActions, ctx);
this.mcpDescServer = mcpDescServer; this.mcpDescServer = mcpDescServer;
} }
@@ -666,12 +671,12 @@ public class LocalRunnerClient extends RunnerClient {
} }
} }
private static final class Common extends LocalWatchServiceHelper { private static final class Common extends LocalWatchEventProcessor {
private final Map<String, McpSyncClient> mcpClients; private final Map<String, McpSyncClient> mcpClients;
private Common(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions, Map<String, McpSyncClient> mcpClients) { private Common(ConcurrentHashMap<String, MetaActionInfo> existedMetaActions, Map<String, McpSyncClient> mcpClients, WatchContext ctx) {
super(existedMetaActions); super(existedMetaActions, ctx);
this.mcpClients = mcpClients; this.mcpClients = mcpClients;
} }