dsh-api-runner 0.1.0 → 0.2.1

package/package.json

@@ -1,77 +1,71 @@
-{
-  "name": "dsh-api-runner",
-  "version": "0.1.0",
-  "description": "DSH 插件：按配置调用后端 HTTP 接口、启停/重启本地开发服务、增量读取日志并等待日志特征，让模型能\"改完自己验\"。",
-  "type": "module",
-  "license": "MIT",
-  "author": "Moz (lhhzmz229)",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/lhhzmz229/dsh-api-runner.git"
-  },
-  "homepage": "https://github.com/lhhzmz229/dsh-api-runner#readme",
-  "bugs": {
-    "url": "https://github.com/lhhzmz229/dsh-api-runner/issues"
-  },
-  "keywords": [
-    "dsh",
-    "dsh-plugin",
-    "deepseek-harness",
-    "api-runner",
-    "http-client",
-    "log-tail",
-    "spring-boot",
-    "java",
-    "devtools"
-  ],
-  "main": "src/main.js",
-  "exports": {
-    ".": "./src/main.js",
-    "./runner": "./src/main.js",
-    "./client": "./client/client.js",
-    "./package.json": "./package.json"
-  },
-  "engines": {
-    "node": ">=20",
-    "dsh": ">=0.1.0-rc.6 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0"
-  },
-  "scripts": {
-    "test": "node test/smoke.mjs && node test/plugin.mjs",
-    "test:all": "node test/smoke.mjs && node test/plugin.mjs && node test/client.mjs && node test/managed.mjs && node test/java.mjs",
-    "stage": "node scripts/stage.mjs",
-    "release": "node scripts/stage.mjs --release"
-  },
-  "dependencies": {
-    "yaml": "^2.8.0"
-  },
-  "peerDependencies": {
-    "dsh-better-sidebar": ">=0.12.0"
-  },
-  "peerDependenciesMeta": {
-    "dsh-better-sidebar": {
-      "optional": true
-    }
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "platform": "web",
-      "inject": [
-        "dsh-better-sidebar"
-      ]
-    }
-  },
-  "files": [
-    "cordis.patch.yml",
-    "src",
-    "client",
-    "docs",
-    "scripts",
-    "test",
-    "README.md",
-    "LICENSE",
-    "dsh-api-runner.example.yml"
-  ]
-}
+{
+  "name": "dsh-api-runner",
+  "version": "0.2.1",
+  "description": "DSH 插件：按配置调用后端 HTTP 接口、启停/重启本地开发服务、增量读取日志并等待日志特征，让模型能\"改完自己验\"。",
+  "type": "module",
+  "license": "MIT",
+  "author": "Moz (lhhzmz229)",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lhhzmz229/dsh-api-runner.git"
+  },
+  "homepage": "https://github.com/lhhzmz229/dsh-api-runner#readme",
+  "bugs": {
+    "url": "https://github.com/lhhzmz229/dsh-api-runner/issues"
+  },
+  "keywords": [
+    "dsh",
+    "dsh-plugin",
+    "deepseek-harness",
+    "api-runner",
+    "http-client",
+    "log-tail",
+    "spring-boot",
+    "java",
+    "devtools"
+  ],
+  "main": "src/main.js",
+  "exports": {
+    ".": "./src/main.js",
+    "./runner": "./src/main.js",
+    "./client": "./client/client.js",
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": ">=20",
+    "dsh": ">=0.1.0-rc.6 <0.2.0-0 || >=0.2.0-rc.1 <0.3.0-0"
+  },
+  "scripts": {
+    "test": "node test/smoke.mjs && node test/plugin.mjs",
+    "test:all": "node test/smoke.mjs && node test/plugin.mjs && node test/client.mjs && node test/managed.mjs && node test/java.mjs",
+    "stage": "node scripts/stage.mjs",
+    "release": "node scripts/stage.mjs --release"
+  },
+  "dependencies": {
+    "yaml": "^2.8.0"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "inject": [
+        "@deepseek-ai/dsh-client-ui-layout",
+        "@deepseek-ai/dsh-client-ui-sidebar",
+        "@deepseek-ai/dsh-client-ui-sidebar-right"
+      ]
+    }
+  },
+  "files": [
+    "cordis.patch.yml",
+    "src",
+    "client",
+    "docs",
+    "scripts",
+    "test",
+    "README.md",
+    "LICENSE",
+    "dsh-api-runner.example.yml"
+  ]
+}

package/src/java-runner.js

@@ -267,7 +267,7 @@ export class JavaRunner {
             extraJvmArgs: [`-DdshApiRunner.runId=${id}`],
         });
         this._ensureLogHeader(logPath, `接管 pid ${sourcePid}（${id}）`);
-        const spawned = spawnService({ javaExe: snapshot.javaExe, argv: built.argv, cwd: snapshot.cwd, logPath });
+        const spawned = await spawnService({ javaExe: snapshot.javaExe, argv: built.argv, cwd: snapshot.cwd, logPath });
         if (!spawned.ok) return { ok: false, code: 'SPAWN_FAILED', message: spawned.message, compile };
 
         const record = {
@@ -459,7 +459,7 @@ export class JavaRunner {
 
         // 每次重启开一个新日志段，历史启动记录不被覆盖
         const logPath = this.logPathOf(entry.id);
-        const spawned = spawnService({ javaExe: entry.javaExe, argv: entry.argv, cwd: entry.cwd, logPath });
+        const spawned = await spawnService({ javaExe: entry.javaExe, argv: entry.argv, cwd: entry.cwd, logPath });
         if (!spawned.ok) return { ok: false, code: 'SPAWN_FAILED', message: spawned.message, compile };
 
         const record = { ...entry, pid: spawned.pid, logPath, argv: entry.argv, startedAt: new Date().toISOString(), stoppedAt: '' };
@@ -530,7 +530,7 @@ export class JavaRunner {
         });
         const logPath = this.logPathOf(id);
         this._ensureLogHeader(logPath, `按保存的配置启动 ${id}`);
-        const spawned = spawnService({ javaExe: saved.javaExe, argv: built.argv, cwd: saved.cwd, logPath });
+        const spawned = await spawnService({ javaExe: saved.javaExe, argv: built.argv, cwd: saved.cwd, logPath });
         if (!spawned.ok) return { ok: false, code: 'SPAWN_FAILED', message: spawned.message, compile };
 
         const record = {

package/src/main.js

@@ -61,8 +61,13 @@ const PARAMETERS = {
         log_id: { type: 'string', description: '日志 id 或 name（log、wait_log、reset_log 用；省略时取第一个日志）' },
         java_action: {
             type: 'string',
-            enum: ['list', 'start', 'stop', 'restart', 'log', 'status', 'detail', 'ignore', 'unignore', 'save', 'unsave', 'start_saved', 'settings'],
-            description: 'Java 服务动作（action=java 用）：list 列出；detail 服务详情+日志；start 接管启动（先编译再杀旧进程）；stop/restart 只对插件启动的生效；log 读日志；ignore/unignore 在面板列表中隐藏/恢复；save 把当前进程的启动配方向保存下来（之后不用 IDEA 也能起）；unsave 删除保存；start_saved 按保存的配置启动；settings 读写插件设置（数据目录/默认工作区）',
+            enum: ['list', 'start', 'stop', 'restart', 'log', 'status', 'detail', 'ignore', 'unignore', 'save', 'unsave', 'start_saved', 'start_all', 'settings'],
+            description: 'Java 服务动作（action=java 用）：list 列出；detail 服务详情+日志；start 接管启动（先编译再杀旧进程）；stop/restart 只对插件启动的生效；log 读日志；ignore/unignore 在面板列表中隐藏/恢复；save 把当前进程的启动配方向保存下来（之后不用 IDEA 也能起）；unsave 删除保存；start_saved 按保存的配置启动一个；start_all 一键启动所有已保存的服务（已运行的跳过，单个失败不影响其余，返回每个的成败）；settings 读写插件设置（数据目录/默认工作区）',
+        },
+        java_ids: {
+            type: 'array',
+            items: { type: 'string' },
+            description: 'java_action=start_all 时只启动这些服务（省略则启动全部已保存的）',
         },
         pid: { type: 'number', description: '要接管的 Java 进程 pid（java_action=start 用）' },
         java_id: { type: 'string', description: '插件托管的服务名或 pid（java_action=stop/restart/log/save/unsave/start_saved 用）' },
@@ -187,6 +192,18 @@ async function runTool(service, args, projectPath) {
                     timeoutMs,
                 });
             }
+            // 一键启动：把「已保存」里的服务全拉起来（或只拉 java_ids 列的那几个）
+            if (javaAction === 'start_all') {
+                const ids = Array.isArray(args.java_ids)
+                    ? args.java_ids.map((id) => String(id))
+                    : (args.java_id ? [String(args.java_id)] : []);
+                return service.startAllSavedJava(projectPath, ids, {
+                    compile: args.compile !== false,
+                    restart: args.restart === true,
+                    timeoutMs,
+                    compileTimeoutMs: args.timeout_ms ? Number(args.timeout_ms) : undefined,
+                });
+            }
             if (javaAction === 'settings') {
                 if (args.settings && typeof args.settings === 'object') return service.saveSettings(asObject(args.settings));
                 return service.settings();
@@ -547,6 +564,18 @@ async function handleHttp(req, res, service, projectOf) {
             timeoutMs: body.timeout_ms ? Number(body.timeout_ms) : undefined,
         }));
     }
+    // 一键启动：后台跑，立刻返回批次 id；面板轮询 java/start-all/status 看进度
+    if (route === 'java/start-all' && req.method === 'POST') {
+        const body = await readBody();
+        return send(200, service.startSavedJavaBatch(pickCwd(cwd, url, body), Array.isArray(body.ids) ? body.ids : [], {
+            compile: body.compile !== false,
+            restart: body.restart === true,
+            timeoutMs: body.timeout_ms ? Number(body.timeout_ms) : undefined,
+        }));
+    }
+    if (route === 'java/start-all/status' && req.method === 'GET') {
+        return send(200, service.startBatchStatus(url.searchParams.get('batch') || ''));
+    }
     if (route === 'settings' && req.method === 'GET') {
         return send(200, service.settings());
     }