@windypro-rourou/dsh-logcat 0.4.2 → 0.5.0-preview.1

package/README.md

@@ -48,6 +48,19 @@ dsh plugin --profile web update                # 升到当前 major 内最新
 # 或强制最新：dsh plugin --profile web add @windypro-rourou/dsh-logcat@latest
 # 更新后重启 GUI（dsh web）生效
 
+# 尝鲜 preview 版（日常迭代高频更新，可能不稳定）：
+dsh plugin --profile web add @windypro-rourou/dsh-logcat@preview
+```
+
+## 发布策略（main / preview 双通道）
+
+- **`main` 分支 + npm `latest` 标签**：稳定正式版，**低频发布**，每次至少凑够 3-4 个功能再发，
+  避免频繁更新提醒打扰用户。
+- **`preview` 分支 + npm `preview` 标签**：日常迭代，有啥更啥（高频），供尝鲜用户测试；
+  凑够足够功能后合并回 `main` 批量发布正式版。
+- 版本自检会按安装通道提示（正式版用户只看 `latest`，preview 用户只看 `preview`，互不打扰）。
+
+```bash
 # 方式二（源码本地链接，实时生效无需重启）：把插件链进 web profile，
 # 并在 ~/.dsh/profiles/web/cordis.patch.yml 增加一行：
 pnpm --dir "%USERPROFILE%\.dsh\profiles\web" add link:F:\dsh-logcat

package/lib/client.js

@@ -35,8 +35,10 @@ window.__ModuleLoader__.load({
 [data-dsh-logcat-entry] .lc-entry-label { font-size: 13px; line-height: 1.2; opacity: .92; }
 .dsh-logcat-view { position: fixed; top: 0; right: 0; bottom: 0; width: min(620px, 94vw); display: flex; flex-direction: column; background: var(--lc-bg, #ffffff); border-left: 1px solid rgba(128,128,128,.3); box-shadow: -10px 0 28px rgba(0,0,0,.18); z-index: 9999; }
 .dsh-logcat-view[hidden] { display: none !important; }
-.dsh-logcat-resize { position: absolute; left: -5px; top: 0; bottom: 0; width: 10px; cursor: col-resize; z-index: 2; }
-.dsh-logcat-resize:hover, .dsh-logcat-resize[data-drag] { background: rgba(128,128,128,.28); }
+.dsh-logcat-resize { position: absolute; left: -6px; top: 0; bottom: 0; width: 12px; cursor: col-resize; z-index: 2; display: flex; align-items: center; justify-content: center; }
+.dsh-logcat-resize::before { content: ""; width: 3px; height: 48px; border-radius: 2px; background: rgba(128,128,128,.35); transition: background .15s, height .15s; }
+.dsh-logcat-resize:hover::before, .dsh-logcat-resize[data-drag]::before { background: rgba(128,128,128,.75); height: 72px; }
+.dsh-logcat-resize:hover, .dsh-logcat-resize[data-drag] { background: rgba(128,128,128,.16); }
 .lc-panel { display: flex; flex-direction: column; height: 100%; min-height: 0; font-family: -apple-system, "Segoe UI", "Microsoft YaHei", sans-serif; }
 .lc-header { display: flex; align-items: center; gap: 8px; padding: 8px 12px; border-bottom: 1px solid rgba(128,128,128,.25); flex: none; }
 .lc-back { border: 0; background: transparent; color: inherit; font: inherit; cursor: pointer; display: flex; align-items: center; gap: 4px; padding: 4px 8px; border-radius: 6px; font-size: 13px; }
@@ -117,6 +119,8 @@ window.__ModuleLoader__.load({
 			const [currentVersion, setCurrentVersion] = useState("");
 			const [latestVersion, setLatestVersion] = useState("");
 			const [updateAvailable, setUpdateAvailable] = useState(false);
+			const [updateKind, setUpdateKind] = useState("");
+			const [updateHint, setUpdateHint] = useState("");
 			const [level, setLevel] = useState("");
 			const [keyword, setKeyword] = useState("");
 			const [autoScroll, setAutoScroll] = useState(true);
@@ -255,6 +259,8 @@ window.__ModuleLoader__.load({
 						setCurrentVersion(body.currentVersion ?? "");
 						setLatestVersion(body.latestVersion ?? "");
 						setUpdateAvailable(body.updateAvailable === true);
+						setUpdateKind(body.updateKind ?? "");
+						setUpdateHint(body.updateHint ?? "");
 						devicesRef.current = body.devices ?? [];
 						if (serialRef.current === "" || !(body.devices ?? []).some((d) => d.serial === serialRef.current)) {
 							const first = (body.devices ?? []).find((d) => d.state === "device");
@@ -457,9 +463,9 @@ window.__ModuleLoader__.load({
 					h("span", null, "显示 " + filtered.length + " / 缓冲 " + entries.length + " 行"),
 					h("span", { title: "插件版本" }, "v" + (currentVersion || "?")),
 					updateAvailable === true
-						? h("span", { style: { color: "#fbc02d" } },
-							h("b", null, "新版本 " + latestVersion + " 可更新"),
-							"（dsh plugin --profile web update 后重启 GUI）")
+						? h("span", { style: { color: updateKind === "preview" ? "#4fc3f7" : "#fbc02d" } },
+							h("b", null, updateHint || "有新版本"),
+							updateKind === "preview" ? "（preview 尝鲜版）" : "（dsh plugin --profile web update 后重启 GUI）")
 						: null,
 					currentPackage !== ""
 						? h("span", { title: "当前测试应用包名（agent 通过 logcat_set_package 设置）" }, "测试: " + currentPackage)
@@ -661,6 +667,16 @@ window.__ModuleLoader__.load({
 			};
 			const onDown = (e) => {
 				e.preventDefault();
+				if (drag !== null) return;
+				// double-click on the handle resets to the default width
+				const now = Date.now();
+				if (now - (handle?._lastClick ?? 0) < 350) {
+					handle._lastClick = 0;
+					container.style.width = Math.min(DEFAULT_WIDTH, Math.max(MIN_WIDTH, window.innerWidth - 80)) + "px";
+					try { localStorage.setItem("dsh-logcat-width", String(Math.min(DEFAULT_WIDTH, Math.max(MIN_WIDTH, window.innerWidth - 80)))); } catch { /* private */ }
+					return;
+				}
+				handle._lastClick = now;
 				drag = { startX: e.clientX, startWidth: container.getBoundingClientRect().width };
 				handle?.setAttribute("data-drag", "");
 				window.addEventListener("mousemove", onMove);
@@ -680,7 +696,7 @@ window.__ModuleLoader__.load({
 				container.hidden = true; // side-drawer: hidden until the sidebar entry is clicked
 				handle = document.createElement("div");
 				handle.className = "dsh-logcat-resize";
-				handle.title = "拖拽调整宽度";
+				handle.title = "拖拽调整宽度（双击重置）";
 				handle.addEventListener("mousedown", onDown);
 				container.appendChild(handle);
 				document.body.appendChild(container);

package/lib/index.js

@@ -25,22 +25,65 @@ import { defineTool } from '@deepseek-ai/dsh-tools'
 /** This package's manifest (name + version), read from the installed location. */
 const OWN_MANIFEST = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'))
 
-/** Latest published version on npm (cached 1h; null until first check). */
-let latestVersion = null
+/** Latest published versions per dist-tag (cached 1h; null until first check). */
+let latestVersion = null   // dist-tags.latest (stable)
+let previewVersion = null  // dist-tags.preview (experimental)
 let lastVersionCheck = 0
 
-/** Refresh the cached latest npm version of this package (offline-safe). */
+/** Simple semver compare: 1 when a > b, -1 when a < b, 0 equal. Prerelease < release. */
+function semverCompare(a, b) {
+  const parse = (v) => {
+    const m = /^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?/.exec(v ?? '')
+    return m ? { major: Number(m[1]), minor: Number(m[2]), patch: Number(m[3]), pre: m[4] ?? null } : null
+  }
+  const pa = parse(a)
+  const pb = parse(b)
+  if (pa === null || pb === null) return 0
+  for (const key of ['major', 'minor', 'patch']) {
+    if (pa[key] !== pb[key]) return pa[key] > pb[key] ? 1 : -1
+  }
+  if (pa.pre === pb.pre) return 0
+  if (pa.pre === null) return 1 // release > prerelease
+  if (pb.pre === null) return -1
+  return pa.pre > pb.pre ? 1 : -1
+}
+
+/** Refresh the cached npm dist-tags of this package (offline-safe). */
 async function ensureVersionCheck() {
-  if (latestVersion !== null && Date.now() - lastVersionCheck < 3600_000) return
+  if ((latestVersion !== null || previewVersion !== null) && Date.now() - lastVersionCheck < 3600_000) return
   lastVersionCheck = Date.now()
   try {
-    const res = await fetch(`https://registry.npmjs.org/${encodeURIComponent(OWN_MANIFEST.name)}/latest`, {
+    const res = await fetch(`https://registry.npmjs.org/-/package/${encodeURIComponent(OWN_MANIFEST.name)}/dist-tags`, {
       signal: AbortSignal.timeout(8000),
     })
-    if (res.ok) latestVersion = (await res.json()).version ?? null
+    if (res.ok) {
+      const tags = await res.json()
+      latestVersion = tags.latest ?? null
+      previewVersion = tags.preview ?? null
+    }
   } catch { /* offline / registry unreachable — keep whatever we had */ }
 }
 
+/** Whether this install is a prerelease (preview line). */
+const IS_PREVIEW = OWN_MANIFEST.version.includes('-')
+
+/** The update hint for the current install, or null when up to date. */
+function updateHint() {
+  if (IS_PREVIEW) {
+    if (previewVersion !== null && semverCompare(previewVersion, OWN_MANIFEST.version) > 0) {
+      return { kind: 'preview', version: previewVersion, text: `新 preview 版本 ${previewVersion} 可更新（npm 标签 preview；正式版 ${latestVersion ?? '?'} 未受影响）` }
+    }
+    if (previewVersion === null && latestVersion !== null && semverCompare(latestVersion, OWN_MANIFEST.version) > 0) {
+      return { kind: 'stable', version: latestVersion, text: `正式版 ${latestVersion} 已发布，可切回稳定版` }
+    }
+    return null
+  }
+  if (latestVersion !== null && semverCompare(latestVersion, OWN_MANIFEST.version) > 0) {
+    return { kind: 'stable', version: latestVersion, text: `新版本 ${latestVersion} 可更新` }
+  }
+  return null
+}
+
 /** Stable cordis plugin name. */
 export const name = 'logcat'
 
@@ -78,9 +121,12 @@ function logcatGuidance(engine) {
     const pkgLine = engine.currentPackage !== ''
       ? `当前测试应用包名：${engine.currentPackage}（logcat_recent 默认按它过滤日志）。`
       : ''
-    const versionLine = latestVersion !== null && latestVersion !== OWN_MANIFEST.version
-      ? `dsh-logcat 有新版本：已装 ${OWN_MANIFEST.version}，最新 ${latestVersion}（用户可执行 dsh plugin --profile web update 后重启 GUI 升级）。`
-      : ''
+    const versionLine = (() => {
+      const hint = updateHint()
+      if (hint === null) return ''
+      const tag = IS_PREVIEW ? 'preview' : 'stable'
+      return `dsh-logcat 更新提醒（${tag} 通道）：${hint.text}（升级：dsh plugin --profile web update 或 add @windypro-rourou/dsh-logcat@${hint.kind === 'preview' ? 'preview' : 'latest'}，然后重启 GUI）。`
+    })()
     return `${LOGCAT_GUIDANCE}\n${deviceLine}${pkgLine !== '' ? `\n${pkgLine}` : ''}${versionLine !== '' ? `\n${versionLine}` : ''}`
   }
 }
@@ -507,6 +553,7 @@ function makeRoutes(engine) {
         if (!isLoopbackRequest(req)) { writeJson(res, 403, { error: 'forbidden: loopback-only' }); return }
         if ((req.method ?? 'GET') !== 'GET') { writeJson(res, 405, { error: 'method not allowed' }); return }
         await ensureVersionCheck()
+        const hint = updateHint()
         writeJson(res, 200, {
           adbPath: engine.adb,
           adbVersion: engine.adbVersion,
@@ -516,7 +563,11 @@ function makeRoutes(engine) {
           currentPackage: engine.currentPackage,
           currentVersion: OWN_MANIFEST.version,
           latestVersion,
-          updateAvailable: latestVersion !== null && latestVersion !== OWN_MANIFEST.version,
+          previewVersion,
+          updateAvailable: hint !== null,
+          updateKind: hint?.kind ?? null,
+          updateTarget: hint?.version ?? null,
+          updateHint: hint?.text ?? null,
         })
       },
     },

package/package.json

@@ -1,48 +1,48 @@
-{
-  "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.4.2",
-  "type": "module",
-  "packageManager": "pnpm@11.22.0",
-  "engines": {
-    "node": "^22.19.0 || >=24.0.0"
-  },
-  "main": "lib/index.js",
-  "exports": {
-    ".": {
-      "default": "./lib/index.js"
-    },
-    "./client": {
-      "default": "./lib/client.js"
-    },
-    "./package.json": "./package.json"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    },
-    "client": {
-      "inject": [
-        "@deepseek-ai/dsh-client-runtime"
-      ],
-      "platform": "web"
-    }
-  },
-  "dependencies": {
-    "ws": "^8.18.0"
-  },
-  "peerDependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "files": [
-    "lib/**/*.js",
-    "cordis.patch.yml",
-    "README.md"
-  ],
-  "license": "Apache-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/zhu1090093659/dsh-web-ui.git"
-  }
-}
+{
+  "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.5.0-preview.1",
+  "type": "module",
+  "packageManager": "pnpm@11.22.0",
+  "engines": {
+    "node": "^22.19.0 || >=24.0.0"
+  },
+  "main": "lib/index.js",
+  "exports": {
+    ".": {
+      "default": "./lib/index.js"
+    },
+    "./client": {
+      "default": "./lib/client.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "inject": [
+        "@deepseek-ai/dsh-client-runtime"
+      ],
+      "platform": "web"
+    }
+  },
+  "dependencies": {
+    "ws": "^8.18.0"
+  },
+  "peerDependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "files": [
+    "lib/**/*.js",
+    "cordis.patch.yml",
+    "README.md"
+  ],
+  "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/WindyPro-rourou/dsh-logcat.git"
+  }
+}