@windypro-rourou/dsh-logcat 0.2.7 → 0.2.9

package/README.md

@@ -4,8 +4,10 @@ DSH Web GUI 的安卓实机调试面板（类似 Android Studio 的 Logcat 视
 
 ## 功能
 
-- **自动连接**：探测本机 adb（`ANDROID_HOME` / `ANDROID_SDK_ROOT` / 默认 `%LOCALAPPDATA%\Android\Sdk` / PATH），
-  每 2 秒轮询 `adb devices -l`；检测到处于调试模式的设备**自动附加 logcat 流**（`-v threadtime`），无需打开面板。
+- **自动连接**：探测本机 adb（`ANDROID_HOME` / `ANDROID_SDK_ROOT` / 默认 `%LOCALAPPDATA%\Android\Sdk` / PATH /
+  `~/.dsh/adb`），每 2 秒轮询 `adb devices -l`；检测到处于调试模式的设备**自动附加 logcat 流**（`-v threadtime`），无需打开面板。
+- **一键安装 adb**：未找到 adb 时，面板状态栏显示「一键安装 adb」按钮 —— 从 USTC 镜像（Google 官方兜底）
+  下载 platform-tools 解压到 `~/.dsh/adb` 并自动接入，开箱即用（约 10MB）。
 - **实时日志**：WebSocket 推送，每设备保留最近 2000 行环形缓冲；断线自动重连（指数退避）。
 - **Logcat 面板**（侧边栏「Logcat」入口，右侧抽屉，**宽度可拖拽调整并记忆**）：
   - 设备下拉（显示型号/序列号/状态，记住上次选择）

package/lib/client.js

@@ -110,6 +110,7 @@ window.__ModuleLoader__.load({
 			const [paused, setPaused] = useState(false);
 			const [currentPackage, setCurrentPackage] = useState("");
 			const [pkgInput, setPkgInput] = useState("");
+			const [installingAdb, setInstallingAdb] = useState(false);
 			const [level, setLevel] = useState("");
 			const [keyword, setKeyword] = useState("");
 			const [autoScroll, setAutoScroll] = useState(true);
@@ -329,6 +330,30 @@ window.__ModuleLoader__.load({
 					.catch(() => { /* device offline etc. */ });
 			};
 
+			const installAdb = () => {
+				setInstallingAdb(true);
+				fetch(API_BASE + "/install-adb", { method: "POST" })
+					.then((res) => res.json())
+					.then((body) => {
+						if (body?.ok !== true) {
+							window.alert("adb 安装失败：" + (body?.error ?? "未知错误"));
+							return;
+						}
+						// Refresh status so the panel picks up the freshly installed adb.
+						return fetch(API_BASE + "/status")
+							.then((res) => res.json())
+							.then((b) => {
+								setAdbPath(b.adbPath ?? "");
+								setAdbReady(b.ready === true);
+								setDevices(b.devices ?? []);
+								setStreaming(b.streaming ?? []);
+								setCurrentPackage(b.currentPackage ?? "");
+							});
+					})
+					.catch(() => { window.alert("adb 安装失败：网络错误"); })
+					.finally(() => setInstallingAdb(false));
+			};
+
 			return h("div", { className: "lc-panel" },
 				h("div", { className: "lc-header" },
 					h("button", { type: "button", className: "lc-back", onClick: () => controller.close() },
@@ -407,7 +432,18 @@ window.__ModuleLoader__.load({
 						: h(VirtualLog, { entries: filtered, scrollTop, onScrollTop: setScrollTop, bodyRef }),
 				),
 				h("div", { className: "lc-status" },
-					h("span", null, h("b", null, adbReady ? "adb 就绪" : "未找到 adb"), " · " + (adbPath || "—")),
+					h("span", null,
+						h("b", null, adbReady ? "adb 就绪" : "未找到 adb"),
+						" · " + (adbPath || "—"),
+						!adbReady
+							? h("button", {
+								type: "button",
+								className: "lc-btn",
+								style: { marginLeft: 8, padding: "2px 8px" },
+								title: "从 Google 官方下载 platform-tools 到 ~/.dsh/adb 并接入（约 10MB）",
+								onClick: installAdb,
+							}, installingAdb ? "安装中…" : "一键安装 adb")
+							: null),
 					h("span", null, "设备 " + devices.length + " · 在线 " + devices.filter((d) => d.state === "device").length),
 					h("span", null, "显示 " + filtered.length + " / 缓冲 " + entries.length + " 行"),
 					currentPackage !== ""

package/lib/index.js

@@ -55,7 +55,12 @@ function logcatGuidance(engine) {
 
 /** ---------------------------------------------------------------- adb */
 
-/** Candidate adb.exe locations, in probe order. */
+/** Where the plugin can self-install adb platform-tools (~/.dsh/adb). */
+function bundledAdbRoot() {
+  return join(homedir(), '.dsh', 'adb')
+}
+
+/** Candidate adb(.exe) locations, in probe order. */
 function adbCandidates() {
   const list = []
   const envs = [process.env.ANDROID_HOME, process.env.ANDROID_SDK_ROOT]
@@ -65,9 +70,69 @@ function adbCandidates() {
   const sdk = join(homedir(), 'AppData', 'Local', 'Android', 'Sdk')
   list.push(join(sdk, 'platform-tools', 'adb.exe'))
   list.push(join(sdk, 'platform-tools', 'adb'))
+  // Plugin-managed install location (one-click setup on first run).
+  list.push(join(bundledAdbRoot(), 'platform-tools', 'adb.exe'))
+  list.push(join(bundledAdbRoot(), 'platform-tools', 'adb'))
   return list
 }
 
+/** Official platform-tools zip mirrors for this host, in preference order. */
+function platformToolsUrls() {
+  const file = {
+    win32: 'platform-tools-latest-windows.zip',
+    darwin: 'platform-tools-latest-darwin.zip',
+  }[process.platform] ?? 'platform-tools-latest-linux.zip'
+  return [
+    'https://mirrors.ustc.edu.cn/android/repository/' + file,
+    'https://dl.google.com/android/repository/' + file,
+  ]
+}
+
+/** Download and unpack platform-tools into ~/.dsh/adb. Resolves the adb path. */
+export async function installPlatformTools() {
+  const { mkdir, rm, writeFile } = await import('node:fs/promises')
+  const { tmpdir } = await import('node:os')
+  const dest = bundledAdbRoot()
+  await mkdir(dest, { recursive: true })
+  const zipPath = join(tmpdir(), `platform-tools-${Date.now()}.zip`)
+  let downloaded = false
+  let lastError = null
+  for (const url of platformToolsUrls()) {
+    try {
+      const response = await fetch(url, { signal: AbortSignal.timeout(180000) })
+      if (!response.ok) throw new Error(`HTTP ${response.status}`)
+      await writeFile(zipPath, Buffer.from(await response.arrayBuffer()))
+      downloaded = true
+      break
+    } catch (error) {
+      lastError = error
+    }
+  }
+  if (!downloaded) throw new Error(`download failed from all mirrors: ${lastError?.message ?? 'unknown'}`)
+  const exe = process.platform === 'win32' ? 'adb.exe' : 'adb'
+  try {
+    if (process.platform === 'win32') {
+      // PowerShell ships with Windows; Expand-Archive unzips natively.
+      await new Promise((resolve, reject) => {
+        execFile('powershell', ['-NoProfile', '-Command', `Expand-Archive -Force -LiteralPath '${zipPath}' -DestinationPath '${dest}'`], { timeout: 180000, windowsHide: true }, (error) => {
+          if (error) reject(new Error('unzip failed: ' + (error.message ?? String(error))))
+          else resolve()
+        })
+      })
+    } else {
+      await new Promise((resolve, reject) => {
+        execFile('unzip', ['-o', zipPath, '-d', dest], { timeout: 180000 }, (error) => {
+          if (error) reject(new Error('unzip failed: ' + (error.message ?? String(error))))
+          else resolve()
+        })
+      })
+    }
+  } finally {
+    await rm(zipPath, { force: true })
+  }
+  return join(dest, 'platform-tools', exe)
+}
+
 /** Run one short adb command, returning stdout (or null on failure). */
 function runAdb(adb, args, timeoutMs = 8000) {
   return new Promise((resolve) => {
@@ -415,9 +480,28 @@ function makeRoutes(engine) {
           ready: engine.adb !== null,
           devices: engine.deviceList(),
           streaming: [...engine.streams.keys()],
+          currentPackage: engine.currentPackage,
         })
       },
     },
+    {
+      kind: 'exact',
+      path: API_BASE + '/install-adb',
+      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 }
+        if (engine.adb !== null) { writeJson(res, 200, { ok: true, already: true, adbPath: engine.adb }); return }
+        try {
+          const adbPath = await installPlatformTools()
+          engine.adb = adbPath
+          engine.adbVersion = (await runAdb(adbPath, ['version']))?.split(/\r?\n/)[0] ?? ''
+          engine.startPolling()
+          writeJson(res, 200, { ok: true, already: false, adbPath })
+        } catch (error) {
+          writeJson(res, 500, { ok: false, error: error instanceof Error ? error.message : String(error) })
+        }
+      },
+    },
     {
       kind: 'exact',
       path: API_BASE + '/exec',

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.7",
+  "version": "0.2.9",
   "type": "module",
   "packageManager": "pnpm@11.22.0",
   "engines": {