@windypro-rourou/dsh-logcat 0.2.5 → 0.2.7

package/README.md

@@ -10,20 +10,25 @@ DSH Web GUI 的安卓实机调试面板（类似 Android Studio 的 Logcat 视
 - **Logcat 面板**（侧边栏「Logcat」入口，右侧抽屉，**宽度可拖拽调整并记忆**）：
   - 设备下拉（显示型号/序列号/状态，记住上次选择）
   - 级别过滤（V/D/I/W/E/F 单选，颜色与 Android Studio 一致）
-  - 关键词过滤、暂停/继续（暂停时缓冲，恢复自动回放）、清空、复制、导出 .txt
+  - 关键词过滤、**测试包名输入框**（回车设置，与 agent 的 `logcat_set_package` 互通，状态栏实时显示）
+  - **截图按钮**：一键截取真机屏幕并下载 PNG（`exec-out screencap`）
+  - 暂停/继续（暂停时缓冲，恢复自动回放）、清空、复制、导出 .txt
   - 窗口化渲染 + 自动滚动（滚动手动上翻时自动停用）
   - 未授权设备提示「请在手机上点击允许 USB 调试」
 - **Agent 工具**：
   - `logcat_devices`：列出已连接设备（serial / model / state），判断能否实机调试。
-  - `adb_exec`：在指定设备执行 `adb shell` 命令（安装 APK、启动 Activity、查进程、截图、dump UI 等），
+  - `adb_exec`：在指定设备执行 `adb shell` 命令（启动 Activity、查进程、dump UI 等），
     破坏性操作（卸载 / 重启 / 清数据）需先确认。
+  - `adb_install`：把**本地 APK 安装到真机**（`adb install -r <本地路径>`，构建产物直接部署）。
+  - `adb_pull`：从设备拉取文件到本地（截图 / 日志 / bugreport）。
   - `logcat_set_package`：设置 / 清除当前测试的 app 包名（安装 / 启动应用后调用）。
   - `logcat_recent`：读取某设备最近 N 条日志，支持级别 / 关键词过滤；
     设置了测试包名（或显式传 `package`）时自动按该 app 的 pid 过滤日志。
 - **实机调试工作流**：构建安卓应用时，agent 的通告会动态列出当前已连接设备（serial + 型号）与当前测试包名，
-  可先向用户确认后用 `adb_exec` 安装 / 启动、`logcat_set_package` 锁定目标 app、`logcat_recent` 按包名查看崩溃日志，
-  闭环真机调试。
-- **附加能力**：`POST /api/dsh-logcat/exec` 可对设备执行 `adb shell` 命令（UI 后续版本可扩展）。
+  可先向用户确认后用 `adb_install` 部署 APK → `adb_exec` 启动 → `logcat_set_package` 锁定目标 app →
+  `logcat_recent` 按包名查看崩溃日志 → `adb_pull` 拉取截图 / 日志，闭环真机调试。
+- **附加能力**：`POST /api/dsh-logcat/exec` 执行 shell、`POST /api/dsh-logcat/package` 设置包名、
+  `GET /api/dsh-logcat/screenshot` 截屏。
 
 ## 安装
 

package/lib/client.js

@@ -109,6 +109,7 @@ window.__ModuleLoader__.load({
 			const [connected, setConnected] = useState(false);
 			const [paused, setPaused] = useState(false);
 			const [currentPackage, setCurrentPackage] = useState("");
+			const [pkgInput, setPkgInput] = useState("");
 			const [level, setLevel] = useState("");
 			const [keyword, setKeyword] = useState("");
 			const [autoScroll, setAutoScroll] = useState(true);
@@ -300,6 +301,34 @@ window.__ModuleLoader__.load({
 			const deviceState = device?.state ?? "";
 			const live = connected && serial !== "" && streaming.includes(serial);
 
+			const setPackageFilter = (pkg) => {
+				const value = (pkg ?? "").trim();
+				setPkgInput(value);
+				fetch(API_BASE + "/package", {
+					method: "POST",
+					headers: { "content-type": "application/json" },
+					body: JSON.stringify({ package: value }),
+				}).catch(() => { /* host not up yet */ });
+			};
+
+			const takeScreenshot = () => {
+				fetch(API_BASE + "/screenshot?serial=" + encodeURIComponent(serial))
+					.then((res) => {
+						if (!res.ok) throw new Error("HTTP " + res.status);
+						return res.blob();
+					})
+					.then((blob) => {
+						const a = document.createElement("a");
+						a.href = URL.createObjectURL(blob);
+						a.download = "logcat-shot-" + (serial || "device") + "-" + new Date().toISOString().replace(/[:.]/g, "-") + ".png";
+						document.body.appendChild(a);
+						a.click();
+						a.remove();
+						setTimeout(() => URL.revokeObjectURL(a.href), 5000);
+					})
+					.catch(() => { /* device offline etc. */ });
+			};
+
 			return h("div", { className: "lc-panel" },
 				h("div", { className: "lc-header" },
 					h("button", { type: "button", className: "lc-back", onClick: () => controller.close() },
@@ -347,6 +376,18 @@ window.__ModuleLoader__.load({
 						value: keyword,
 						onChange: (e) => setKeyword(e.target.value),
 					}),
+					h("input", {
+						className: "lc-search",
+						type: "text",
+						placeholder: "测试包名（回车）…",
+						title: "设置/清除当前测试应用包名（与 agent 的 logcat_set_package 互通）",
+						value: pkgInput,
+						onChange: (e) => setPkgInput(e.target.value),
+						onKeyDown: (e) => { if (e.key === "Enter") setPackageFilter(pkgInput); },
+						style: { maxWidth: 180 },
+					}),
+					h("button", { type: "button", className: "lc-btn", onClick: () => setPackageFilter(pkgInput), title: "按包名过滤日志（agent 侧 logcat_recent 同步生效）" }, "包名"),
+					h("button", { type: "button", className: "lc-btn", onClick: takeScreenshot, title: "截取真机屏幕并下载 PNG" }, "截图"),
 					h("button", { type: "button", className: "lc-btn", "data-on": paused ? "" : undefined, onClick: togglePause },
 						paused ? "继续" : "暂停"),
 					h("button", { type: "button", className: "lc-btn", onClick: clearLog }, "清空"),

package/lib/index.js

@@ -102,6 +102,20 @@ function runAdbFull(adb, args, timeoutMs = 15000) {
   })
 }
 
+/** Run one adb command that emits binary (e.g. exec-out screencap), returning a Buffer. */
+function runAdbBinary(adb, args, timeoutMs = 20000) {
+  return new Promise((resolve, reject) => {
+    try {
+      execFile(adb, args, { timeout: timeoutMs, windowsHide: true, maxBuffer: 32 * 1024 * 1024, encoding: 'buffer' }, (error, stdout) => {
+        if (error) reject(error)
+        else resolve(stdout)
+      })
+    } catch (error) {
+      reject(error)
+    }
+  })
+}
+
 /** threadtime line: "08-18 14:23:45.678  1234  5678 I Tag    : message" */
 const THREADTIME_RE = /^(\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3})\s+(\d+)\s+(\d+)\s+([VDIWEF])\s+([^:]*?)\s*:\s?(.*)$/
 
@@ -432,6 +446,52 @@ function makeRoutes(engine) {
         }
       },
     },
+    {
+      kind: 'exact',
+      path: API_BASE + '/package',
+      handler: async (req, res) => {
+        if (!isLoopbackRequest(req)) { writeJson(res, 403, { error: 'forbidden: loopback-only' }); return }
+        if ((req.method ?? 'GET') !== 'POST') { writeJson(res, 405, { error: 'method not allowed' }); return }
+        const chunks = []
+        for await (const chunk of req) {
+          if (chunks.length + chunk.length > 64 * 1024) { writeJson(res, 413, { error: 'body too large' }); return }
+          chunks.push(chunk)
+        }
+        let body = {}
+        try { body = JSON.parse(Buffer.concat(chunks).toString('utf8')) } catch { /* fallthrough */ }
+        const pkg = typeof body.package === 'string' ? body.package.trim() : ''
+        engine.currentPackage = pkg
+        engine.broadcast({ type: 'package', package: pkg })
+        writeJson(res, 200, { package: pkg })
+      },
+    },
+    {
+      kind: 'exact',
+      path: API_BASE + '/screenshot',
+      handler: async (req, res) => {
+        if (!isLoopbackRequest(req)) { writeJson(res, 403, { error: 'forbidden: loopback-only' }); return }
+        if ((req.method ?? 'GET') !== 'GET' && (req.method ?? 'GET') !== 'POST') { writeJson(res, 405, { error: 'method not allowed' }); return }
+        if (engine.adb === null) { writeJson(res, 500, { error: 'adb not found' }); return }
+        const url = new URL(req.url ?? '/', 'http://localhost')
+        const requested = url.searchParams.get('serial') ?? ''
+        const serial = requested !== '' && engine.devices.has(requested)
+          ? requested
+          : [...engine.devices.keys()][0] ?? ''
+        if (serial === '') { writeJson(res, 400, { error: 'no device attached' }); return }
+        try {
+          const png = await runAdbBinary(engine.adb, ['-s', serial, 'exec-out', 'screencap', '-p'], 20000)
+          res.writeHead(200, {
+            'content-type': 'image/png',
+            'cache-control': 'no-store',
+            'content-length': png.length,
+            'content-disposition': `inline; filename="logcat-${serial}-${Date.now()}.png"`,
+          })
+          res.end(png)
+        } catch (error) {
+          writeJson(res, 500, { error: error instanceof Error ? error.message : String(error) })
+        }
+      },
+    },
   ]
 
   const upgrade = {
@@ -536,15 +596,18 @@ function logcatRecentTool(engine) {
       const level = typeof args.level === 'string' ? args.level : ''
       const filter = typeof args.filter === 'string' ? args.filter : ''
       const pkg = (typeof args.package === 'string' ? args.package.trim() : '') || engine.currentPackage
+      // The declared output schema is strict (additionalProperties: false), so strip the
+      // internal raw/cont fields before returning — otherwise DSH rejects the result.
+      const toOutput = (list) => list.map((e) => ({ ts: e.ts, pid: e.pid, tid: e.tid, level: e.level, tag: e.tag, msg: e.msg }))
       const picked = engine.recent(serial, lines, level, filter)
-      if (pkg === '') return { entries: picked }
+      if (pkg === '') return { entries: toOutput(picked) }
       const pids = await engine.pidsOfPackage(serial, pkg)
       if (pids.length === 0) {
         return { entries: [], note: `package ${pkg} is not running on ${serial} — start it first (adb_exec: am start -n ...) or pass another package` }
       }
       const byPid = picked.filter((e) => e.pid > 0 && pids.includes(e.pid))
       return byPid.length > 0
-        ? { entries: byPid }
+        ? { entries: toOutput(byPid) }
         : { entries: [], note: `no buffered logcat lines for package ${pkg} (pids ${pids.join(', ')}); the app may not have logged yet` }
     },
   })
@@ -670,6 +733,100 @@ function adbExecTool(engine) {
   })
 }
 
+/** The adb_install agent tool: install a local APK onto a device (adb install -r). */
+function adbInstallTool(engine) {
+  return defineTool({
+    name: 'adb_install',
+    description: 'Install a local APK file onto an attached Android device (adb install -r). ' +
+      'Use after building an APK to deploy it to the real device for debugging. ' +
+      'The apkPath is a LOCAL path on this host (e.g. a build output).',
+    parameters: {
+      serial: { type: 'string', description: 'Device serial from logcat_devices (optional; defaults to the first attached device).' },
+      apkPath: { type: 'string', description: 'Absolute local path to the APK, e.g. "F:/app/build/outputs/apk/debug/app-debug.apk".' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          ok: { type: 'boolean', required: true },
+          code: { type: 'integer' },
+          stdout: { type: 'string', required: true },
+          stderr: { type: 'string', required: true },
+        },
+      },
+      render: (_args, value) => {
+        const parts = []
+        if (value?.stdout) parts.push(value.stdout.trimEnd())
+        if (value?.stderr) parts.push('stderr: ' + value.stderr.trimEnd())
+        if (parts.length === 0) parts.push(value?.ok ? 'installed' : `install failed (exit ${value?.code ?? '?'})`)
+        return [{ type: 'text', text: parts.join('\n') }]
+      },
+    },
+    async execute(args) {
+      const devices = engine.deviceList()
+      const serial = typeof args.serial === 'string' && args.serial !== ''
+        ? args.serial
+        : devices.find((d) => d.state === 'device')?.serial ?? ''
+      const apkPath = typeof args.apkPath === 'string' ? args.apkPath.trim() : ''
+      if (engine.adb === null) return { ok: false, code: null, stdout: '', stderr: 'adb not found on this host' }
+      if (serial === '') return { ok: false, code: null, stdout: '', stderr: 'no attached device; connect and authorize one first' }
+      if (apkPath === '') return { ok: false, code: null, stdout: '', stderr: 'apkPath is required' }
+      if (!existsSync(apkPath)) return { ok: false, code: null, stdout: '', stderr: `APK not found: ${apkPath}` }
+      const result = await runAdbFull(engine.adb, ['-s', serial, 'install', '-r', apkPath], 120000)
+      return { ok: result.ok, code: result.code, stdout: result.stdout, stderr: result.stderr }
+    },
+  })
+}
+
+/** The adb_pull agent tool: copy a file from the device to this host (adb pull). */
+function adbPullTool(engine) {
+  return defineTool({
+    name: 'adb_pull',
+    description: 'Copy a file from an attached Android device to this host (adb pull) — ' +
+      'e.g. pull a screenshot saved via adb_exec (screencap -p /sdcard/x.png), a log file, or a bugreport.',
+    parameters: {
+      serial: { type: 'string', description: 'Device serial from logcat_devices (optional; defaults to the first attached device).' },
+      remotePath: { type: 'string', description: 'Path on the device, e.g. "/sdcard/screen.png".' },
+      localPath: { type: 'string', description: 'Absolute local destination path, e.g. "F:/shots/screen.png".' },
+    },
+    output: {
+      schema: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          ok: { type: 'boolean', required: true },
+          code: { type: 'integer' },
+          stdout: { type: 'string', required: true },
+          stderr: { type: 'string', required: true },
+          localPath: { type: 'string' },
+        },
+      },
+      render: (_args, value) => {
+        const parts = []
+        if (value?.ok && value?.localPath) parts.push(`pulled to ${value.localPath}`)
+        if (value?.stdout) parts.push(value.stdout.trimEnd())
+        if (value?.stderr) parts.push('stderr: ' + value.stderr.trimEnd())
+        if (parts.length === 0) parts.push(`pull failed (exit ${value?.code ?? '?'})`)
+        return [{ type: 'text', text: parts.join('\n') }]
+      },
+    },
+    async execute(args) {
+      const devices = engine.deviceList()
+      const serial = typeof args.serial === 'string' && args.serial !== ''
+        ? args.serial
+        : devices.find((d) => d.state === 'device')?.serial ?? ''
+      const remotePath = typeof args.remotePath === 'string' ? args.remotePath.trim() : ''
+      const localPath = typeof args.localPath === 'string' ? args.localPath.trim() : ''
+      if (engine.adb === null) return { ok: false, code: null, stdout: '', stderr: 'adb not found on this host' }
+      if (serial === '') return { ok: false, code: null, stdout: '', stderr: 'no attached device; connect and authorize one first' }
+      if (remotePath === '' || localPath === '') return { ok: false, code: null, stdout: '', stderr: 'remotePath and localPath are required' }
+      const result = await runAdbFull(engine.adb, ['-s', serial, 'pull', remotePath, localPath], 120000)
+      return { ok: result.ok, code: result.code, stdout: result.stdout, stderr: result.stderr, localPath: result.ok ? localPath : '' }
+    },
+  })
+}
+
 /** ------------------------------------------------------------------ */
 
 /** Mount the adb engine, routes, tool, and announcement. */
@@ -739,6 +896,8 @@ export function apply(ctx, config) {
         logcatDevicesTool(engine),
         adbExecTool(engine),
         logcatSetPackageTool(engine),
+        adbInstallTool(engine),
+        adbPullTool(engine),
       ].map((tool) => ctx.tools.register(tool))
       return () => { for (const dispose of disposers) dispose() }
     }, 'dsh-logcat: tools')

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@windypro-rourou/dsh-logcat",
   "description": "Android Logcat viewer for the dsh web GUI: auto-connects to any adb device in debug mode, live logcat stream with level/keyword filters, pause/clear/export, plus agent tools (logcat_recent). Hot-pluggable — mounted via ~/.dsh/cordis.patch.yml + a profile node_modules copy, no dsh source changes.",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "type": "module",
   "packageManager": "pnpm@11.22.0",
   "engines": {