@windypro-rourou/dsh-logcat 0.6.3 → 0.6.4

package/lib/client.js

@@ -61,6 +61,11 @@ window.__ModuleLoader__.load({
 .lc-mem-bar { display: inline-block; width: 44px; height: 5px; border-radius: 3px; background: light-dark(rgba(0,0,0,.12), rgba(255,255,255,.14)); overflow: hidden; vertical-align: middle; }
 .lc-mem-fill { display: block; height: 100%; border-radius: 3px; background: linear-gradient(90deg, #4caf50, #fbc02d); }
 .lc-mem-fill.hot { background: linear-gradient(90deg, #fbc02d, #ef5350); }
+.lc-icobtn { border: 1px solid light-dark(rgba(0,0,0,.16), rgba(255,255,255,.2)); background: transparent; color: inherit; font: inherit; font-size: 13px; width: 30px; height: 26px; padding: 0; border-radius: 7px; cursor: pointer; display: inline-flex; align-items: center; justify-content: center; }
+.lc-icobtn:hover { background: light-dark(rgba(0,0,0,.06), rgba(255,255,255,.1)); }
+.lc-icobtn[data-on] { background: light-dark(rgba(66,133,244,.12), rgba(66,133,244,.22)); border-color: rgba(66,133,244,.45); color: #4285f4; }
+.lc-hit { background: rgba(66,133,244,.28); border-radius: 2px; color: inherit; }
+.lc-screen-img:fullscreen { background: #000; }
 .lc-toolbar { display: flex; align-items: center; gap: 6px; padding: 6px 12px; border-bottom: 1px solid light-dark(rgba(0,0,0,.1), rgba(255,255,255,.12)); flex: none; flex-wrap: wrap; }
 .lc-select, .lc-search { background: light-dark(rgba(0,0,0,.05), rgba(255,255,255,.08)); border: 1px solid light-dark(rgba(0,0,0,.16), rgba(255,255,255,.2)); border-radius: 7px; color: inherit; font: inherit; font-size: 12px; padding: 5px 9px; }
 .lc-select:focus, .lc-search:focus { outline: 2px solid rgba(66,133,244,.35); border-color: rgba(66,133,244,.5); }
@@ -203,7 +208,8 @@ window.__ModuleLoader__.load({
 			const [keyword, setKeyword] = useState("");
 			const [autoScroll, setAutoScroll] = useState(true);
 			const [scrollTop, setScrollTop] = useState(0);
-			const [tab, setTab] = useState("log");
+			const [tab, setTab] = useState(() => { try { const t = localStorage.getItem("dsh-logcat-tab"); return t === "screen" || t === "re" ? t : "log"; } catch { return "log"; } });
+			const switchTab = (t) => { setTab(t); try { localStorage.setItem("dsh-logcat-tab", t); } catch { /* private mode */ } };
 			const [eventsOn, setEventsOn] = useState(false);
 			const [eventsEntries, setEventsEntries] = useState([]);
 			const [eventsStreaming, setEventsStreaming] = useState([]);
@@ -550,6 +556,24 @@ window.__ModuleLoader__.load({
 				}
 			};
 
+			// Append a tag/term to the keyword filter (matches any term).
+			const addKeyword = (term) => {
+				const t = (term ?? "").trim();
+				if (t === "") return;
+				setKeyword((prev) => {
+					const terms = prev.trim().toLowerCase().split(/\s+/).filter(Boolean);
+					if (terms.includes(t.toLowerCase())) return prev;
+					return prev.trim() === "" ? t : prev.trim() + " " + t;
+				});
+			};
+
+			// Copy one log line (double-click).
+			const copyLine = (raw) => {
+				if (navigator.clipboard !== undefined && raw !== "") {
+					navigator.clipboard.writeText(raw).catch(() => { /* denied */ });
+				}
+			};
+
 			const device = devices.find((d) => d.serial === serial);
 			const deviceState = device?.state ?? "";
 			const live = connected && serial !== "" && streaming.includes(serial);
@@ -905,6 +929,13 @@ window.__ModuleLoader__.load({
 				} catch { /* empty canvas */ }
 			};
 
+			const toggleScreenFullscreen = () => {
+				const el = screenWrapRef.current;
+				if (el === null) return;
+				if (document.fullscreenElement !== null) { try { document.exitFullscreen(); } catch { /* ignored */ } return; }
+				try { el.requestFullscreen?.(); } catch { /* denied */ }
+			};
+
 			return h("div", { className: "lc-panel" },
 				h("div", { className: "lc-header" },
 					h("button", { type: "button", className: "lc-back", onClick: () => controller.close() },
@@ -958,9 +989,9 @@ window.__ModuleLoader__.load({
 					stats === null && serial !== "" ? h("span", { className: "lc-chip" }, "正在采集设备状态…") : null,
 				),
 				h("div", { className: "lc-tabs" },
-					h("button", { type: "button", className: "lc-tab", "data-on": tab === "log" ? "" : undefined, onClick: () => setTab("log") }, "日志"),
-					h("button", { type: "button", className: "lc-tab", "data-on": tab === "screen" ? "" : undefined, onClick: () => setTab("screen") }, "屏幕"),
-					h("button", { type: "button", className: "lc-tab", "data-on": tab === "re" ? "" : undefined, onClick: () => setTab("re") }, "逆向"),
+					h("button", { type: "button", className: "lc-tab", "data-on": tab === "log" ? "" : undefined, onClick: () => switchTab("log") }, "日志"),
+					h("button", { type: "button", className: "lc-tab", "data-on": tab === "screen" ? "" : undefined, onClick: () => switchTab("screen") }, "屏幕"),
+					h("button", { type: "button", className: "lc-tab", "data-on": tab === "re" ? "" : undefined, onClick: () => switchTab("re") }, "逆向"),
 				),
 				tab === "log"
 					? h("div", { className: "lc-toolbar" },
@@ -1000,11 +1031,11 @@ window.__ModuleLoader__.load({
 							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", onClick: loadHistory, title: "从磁盘加载历史日志（重启不丢）" }, "历史"),
-						h("button", { type: "button", className: "lc-btn", "data-on": eventsOn ? "" : undefined, onClick: toggleEvents, title: "logcat -b events 事件缓冲（应用启动/崩溃/生命周期）" }, "events"),
-						h("button", { type: "button", className: "lc-btn", onClick: openCrashModal, title: "崩溃自动快照历史（截图+上下文）" }, "崩溃"),
-						h("button", { type: "button", className: "lc-btn", onClick: () => setWifiOpen(true), title: "WiFi 无线调试（adb pair + connect）" }, "WiFi"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: takeScreenshot, title: "截取真机屏幕并下载 PNG" }, "📷"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: loadHistory, title: "从磁盘加载历史日志（重启不丢）" }, "🕘"),
+						h("button", { type: "button", className: "lc-icobtn", "data-on": eventsOn ? "" : undefined, onClick: toggleEvents, title: "logcat -b events 事件缓冲（应用启动/崩溃/生命周期）" }, "📑"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: openCrashModal, title: "崩溃自动快照历史（截图+上下文）" }, "💥"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: () => setWifiOpen(true), title: "WiFi 无线调试（adb pair + connect）" }, "📶"),
 						h("input", {
 							ref: fileInputRef,
 							type: "file",
@@ -1012,19 +1043,19 @@ window.__ModuleLoader__.load({
 							style: { display: "none" },
 							onChange: (e) => { installApkFile(e.target.files?.[0] ?? null); e.target.value = ""; },
 						}),
-						h("button", { type: "button", className: "lc-btn", onClick: () => fileInputRef.current?.click(), title: "选择本地 APK 安装到当前设备", disabled: installingApk ? true : undefined }, installingApk ? "安装中…" : "装APK"),
-						h("button", { type: "button", className: "lc-btn", "data-on": paused ? "" : undefined, onClick: togglePause },
-							paused ? "继续(" + pendingCount + ")" : "暂停"),
-						h("button", { type: "button", className: "lc-btn", onClick: clearLog }, "清空"),
-						h("button", { type: "button", className: "lc-btn", onClick: copyLog }, "复制"),
-						h("button", { type: "button", className: "lc-btn", onClick: exportLog }, "导出"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: () => fileInputRef.current?.click(), title: "选择本地 APK 安装到当前设备", disabled: installingApk ? true : undefined }, "📦"),
+						h("button", { type: "button", className: "lc-icobtn", "data-on": paused ? "" : undefined, onClick: togglePause, title: "暂停冻结视图（新日志缓冲） / 继续回放" },
+							paused ? "▶" : "⏸"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: clearLog, title: "清空当前视图" }, "🗑"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: copyLog, title: "复制过滤后日志" }, "📋"),
+						h("button", { type: "button", className: "lc-icobtn", onClick: exportLog, title: "导出过滤后日志 .txt" }, "⬇"),
 						h("button", {
 							type: "button",
-							className: "lc-btn",
+							className: "lc-icobtn",
 							"data-on": autoScroll ? "" : undefined,
 							title: "新日志自动滚到底部",
 							onClick: () => setAutoScroll(!autoScroll),
-						}, "自动滚动"),
+						}, "📌"),
 					)
 					: null,
 				tab === "log" || tab === "screen"
@@ -1107,6 +1138,7 @@ window.__ModuleLoader__.load({
 									h("span", null, !hostScreenCapable ? "宿主版本过旧" : (screenOn ? "投屏中 (~" + screenFps + "fps)" : "投屏未开启")),
 									h("input", { placeholder: "输入文字后回车发送…", value: screenText, onChange: (e) => setScreenText(e.target.value), onKeyDown: (e) => { if (e.key === "Enter") sendScreenText(); }, style: { flex: 1, minWidth: 140 } }),
 									h("button", { type: "button", className: "lc-btn", onClick: downloadScreen, title: "下载当前帧 PNG" }, "下载"),
+									h("button", { type: "button", className: "lc-btn", onClick: toggleScreenFullscreen, title: "全屏查看（Esc 退出）" }, "⛶"),
 									h("span", { className: "lc-screen-hint" }, "点击=点按 · 拖动=滑动"),
 								),
 								!hostScreenCapable
@@ -1119,10 +1151,10 @@ window.__ModuleLoader__.load({
 							: eventsOn
 							? (filteredEvents.length === 0
 								? h("div", { className: "lc-empty" }, "events 事件缓冲（已开启流，等待事件…）")
-								: h(VirtualLog, { entries: filteredEvents, scrollTop, onScrollTop: setScrollTop, bodyRef }))
+								: h(VirtualLog, { entries: filteredEvents, scrollTop, onScrollTop: setScrollTop, bodyRef, keyword, onTagClick: addKeyword, onLineDblClick: copyLine }))
 							: (filtered.length === 0
 								? h("div", { className: "lc-empty" }, paused ? "已暂停（" + entries.length + " 条已缓冲）" : "暂无日志")
-								: h(VirtualLog, { entries: filtered, scrollTop, onScrollTop: setScrollTop, bodyRef })),
+								: h(VirtualLog, { entries: filtered, scrollTop, onScrollTop: setScrollTop, bodyRef, keyword, onTagClick: addKeyword, onLineDblClick: copyLine })),
 					tab === "log" && !eventsOn && live && !paused
 						? h("button", { type: "button", className: "lc-fab", onClick: togglePause, title: "暂停：冻结当前视图（新日志进入缓冲）" }, "⏸ 暂停")
 						: null,
@@ -1231,8 +1263,32 @@ window.__ModuleLoader__.load({
 			);
 		}
 
+		/** Split `text` on keyword hits; render hit ranges as <mark>. */
+		function highlightMsg(text, keyword) {
+			const terms = (keyword ?? "").trim().toLowerCase().split(/\s+/).filter(Boolean);
+			if (terms.length === 0 || text === "") return text;
+			const lower = text.toLowerCase();
+			const ranges = [];
+			for (const t of terms) {
+				const idx = lower.indexOf(t);
+				if (idx >= 0) ranges.push([idx, idx + t.length]);
+			}
+			if (ranges.length === 0) return text;
+			ranges.sort((a, b) => a[0] - b[0]);
+			const parts = [];
+			let pos = 0;
+			for (const [s, e] of ranges) {
+				if (s < pos) continue; // overlapping hits: keep the first
+				if (s > pos) parts.push(text.slice(pos, s));
+				parts.push(h("mark", { className: "lc-hit", key: s }, text.slice(s, e)));
+				pos = e;
+			}
+			if (pos < text.length) parts.push(text.slice(pos));
+			return parts;
+		}
+
 		/** Windowed log list: fixed 20px rows, only the visible slice is rendered. */
-		function VirtualLog({ entries, scrollTop, onScrollTop, bodyRef }) {
+		function VirtualLog({ entries, scrollTop, onScrollTop, bodyRef, keyword, onTagClick, onLineDblClick }) {
 			const ROW = 20;
 			const height = useRef(0);
 			const [viewport, setViewport] = useState({ top: 0, bottom: 100 });
@@ -1271,13 +1327,14 @@ window.__ModuleLoader__.load({
 						key: i,
 						className: "lc-line" + (e.cont === true ? " cont" : "") + (isCrash(e) ? " crash" : ""),
 						style: { top: i * ROW },
-						title: e.raw,
+						title: e.raw + "\n（点 tag 过滤 · 双击复制该行）",
+						onDoubleClick: () => { if (onLineDblClick) onLineDblClick(e.raw); },
 					},
 						e.ts !== "" ? h("span", { className: "ts" }, e.ts) : null,
 						e.pid > 0 ? h("span", { className: "pid" }, e.pid + "-" + e.tid) : null,
 						e.level !== "" ? h("span", { className: "lv " + level }, level) : null,
-						e.tag !== "" ? h("span", { className: "tag" }, e.tag) : null,
-						h("span", { className: "msg" }, e.msg !== "" ? e.msg : e.raw),
+						e.tag !== "" ? h("span", { className: "tag", title: "按此 tag 过滤", onClick: (ev) => { ev.stopPropagation(); if (onTagClick) onTagClick(e.tag); } }, e.tag) : null,
+						h("span", { className: "msg" }, highlightMsg(e.msg !== "" ? e.msg : e.raw, keyword)),
 					),
 				);
 			}

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