@windypro-rourou/dsh-logcat 0.6.0-preview.5 → 0.6.0

package/lib/client.js

@@ -139,6 +139,10 @@ window.__ModuleLoader__.load({
 .lc-screen-img { flex: 1; min-height: 0; overflow: auto; display: flex; align-items: center; justify-content: center; cursor: crosshair; background: light-dark(rgba(0,0,0,.03), rgba(255,255,255,.03)); position: relative; }
 .lc-screen-img img, .lc-screen-img canvas { max-width: 100%; max-height: 100%; object-fit: contain; user-select: none; }
 .lc-screen-hint { color: light-dark(#6b7078, #9aa0a8); }
+.lc-pausedbar { display: flex; align-items: center; gap: 8px; padding: 5px 12px; background: light-dark(rgba(251,192,45,.16), rgba(251,192,45,.18)); border-bottom: 1px solid rgba(251,192,45,.45); flex: none; font-size: 12px; color: #fbc02d; }
+.lc-pausedbar .lc-btn { padding: 2px 10px; }
+.lc-fab { position: absolute; right: 14px; bottom: 14px; z-index: 4; border: 1px solid rgba(66,133,244,.45); background: light-dark(rgba(66,133,244,.14), rgba(66,133,244,.24)); color: #4285f4; font: inherit; font-size: 12px; font-weight: 700; padding: 8px 14px; border-radius: 999px; cursor: pointer; box-shadow: 0 4px 14px rgba(0,0,0,.22); }
+.lc-fab:hover { background: light-dark(rgba(66,133,244,.22), rgba(66,133,244,.34)); }
 `;
 		//#endregion
 
@@ -183,6 +187,7 @@ window.__ModuleLoader__.load({
 			const [entries, setEntries] = useState([]);
 			const [connected, setConnected] = useState(false);
 			const [paused, setPaused] = useState(false);
+			const [pendingCount, setPendingCount] = useState(0);
 			const [currentPackage, setCurrentPackage] = useState("");
 			const [pkgInput, setPkgInput] = useState("");
 			const [installingAdb, setInstallingAdb] = useState(false);
@@ -299,10 +304,19 @@ window.__ModuleLoader__.load({
 
 			const appendEntries = (incoming) => {
 				const next = entriesRef.current.concat(incoming);
-				if (next.length > 2000) next.splice(0, next.length - 2000);
+				let removed = 0;
+				if (next.length > 5000) { removed = next.length - 5000; next.splice(0, removed); }
 				entriesRef.current = next;
 				setEntries(next);
-				if (autoScrollRef.current) requestAnimationFrame(() => scrollToBottom());
+				if (autoScrollRef.current) {
+					requestAnimationFrame(() => scrollToBottom());
+				} else if (removed > 0) {
+					// Anchor the viewport: trimming old rows shifts array indexes, so
+					// compensate the scroll position to keep what the user is reading
+					// visually in place (no jumping while auto-scroll is off).
+					const body = bodyRef.current;
+					if (body !== null) body.scrollTop = Math.max(0, body.scrollTop - removed * 20);
+				}
 			};
 
 			const applyFrame = (frame) => {
@@ -334,6 +348,7 @@ window.__ModuleLoader__.load({
 					if (pausedRef.current) {
 						pendingRef.current.push(frame);
 						if (pendingRef.current.length > 800) pendingRef.current.splice(0, pendingRef.current.length - 800);
+						setPendingCount(pendingRef.current.length);
 						return;
 					}
 					if (frame.serial !== serialRef.current) return;
@@ -495,10 +510,13 @@ window.__ModuleLoader__.load({
 			const togglePause = () => {
 				const next = !paused;
 				setPaused(next);
-				if (!next && pendingRef.current.length > 0) {
-					const replay = pendingRef.current.filter((f) => f.serial === serialRef.current);
-					pendingRef.current = [];
-					if (replay.length > 0) appendEntries(replay.map((f) => f.entry));
+				if (!next) {
+					setPendingCount(0);
+					if (pendingRef.current.length > 0) {
+						const replay = pendingRef.current.filter((f) => f.serial === serialRef.current);
+						pendingRef.current = [];
+						if (replay.length > 0) appendEntries(replay.map((f) => f.entry));
+					}
 				}
 			};
 
@@ -953,7 +971,7 @@ window.__ModuleLoader__.load({
 						}),
 						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 ? "继续" : "暂停"),
+							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 }, "导出"),
@@ -986,10 +1004,15 @@ window.__ModuleLoader__.load({
 						h("button", { type: "button", className: "lc-btn", onClick: () => setHistoryNote("") }, "关闭"),
 					)
 					: null,
+				paused && tab === "log" && !eventsOn
+					? h("div", { className: "lc-pausedbar" },
+						h("span", { style: { flex: 1 } }, "⏸ 已暂停 — 新日志缓冲中（" + pendingCount + " 条），列表已冻结"),
+						h("button", { type: "button", className: "lc-btn", onClick: togglePause, title: "恢复实时，回放缓冲日志" }, "继续"),
+					)
+					: null,
 				h("div", { className: "lc-body", ref: bodyRef },
 					tab === "re"
-						? h("div", { className: "lc-re" },
-							h("div", { className: "lc-re-top" },
+						? h("div", { className: "lc-re" },							h("div", { className: "lc-re-top" },
 								h("input", { placeholder: "进程过滤…", value: reFilter, onChange: (e) => setReFilter(e.target.value), onKeyDown: (e) => { if (e.key === "Enter") loadProcesses(); }, style: { width: 120 } }),
 								h("button", { type: "button", className: "lc-btn", onClick: loadProcesses }, "进程"),
 								h("input", { placeholder: "搜索: hello 或 hex:48656c6c6f", value: rePattern, onChange: (e) => setRePattern(e.target.value), onKeyDown: (e) => { if (e.key === "Enter") reSearch(); }, style: { flex: 1, minWidth: 140 } }),
@@ -1041,6 +1064,9 @@ window.__ModuleLoader__.load({
 							: (filtered.length === 0
 								? h("div", { className: "lc-empty" }, paused ? "已暂停（" + entries.length + " 条已缓冲）" : "暂无日志")
 								: h(VirtualLog, { entries: filtered, scrollTop, onScrollTop: setScrollTop, bodyRef })),
+					tab === "log" && !eventsOn && live && !paused
+						? h("button", { type: "button", className: "lc-fab", onClick: togglePause, title: "暂停：冻结当前视图（新日志进入缓冲）" }, "⏸ 暂停")
+						: null,
 				),
 				crashModal
 					? h("div", { className: "lc-overlay", onClick: () => setCrashModal(false) },

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