@taole/dd-playwright 0.1.13 → 0.1.14

package/README.md

@@ -74,7 +74,7 @@ dd-pw update
 dd-pw serve [--port 12309]
 ```
 
-1. 启动后在浏览器打开 `http://127.0.0.1:12309`。在「全局运行配置」的「软件更新」中可检查 npm 最新版本；当当前服务来自 npm 全局安装且有新版本时，可点击「立即更新」。安装完成后需手动重启 Web 服务和 MCP 客户端。源码或项目依赖运行时请按对应安装方式手动更新。
+1. 启动后在浏览器打开 `http://127.0.0.1:12309`。在「全局运行配置」的「软件更新」中可检查 npm 最新版本；发现新版本时，可在终端执行 `dd-pw update`，更新后在 Agent 或 IDE 中重载 MCP。源码或项目依赖运行时请按对应安装方式手动更新。
 2. 点击右上角 **「+ 添加绑定账号」**，后台会以独立的 Playwright 实例拉起扫码页并渲染二维码。
 3. 使用微信或点点 App 扫码登录，完成后会自动捕获 Cookie 与 `storageState`，提取点点账号 UID、昵称与头像，并落库至 `$BROWSER_MCP_DATA_DIR/runtime.db`。
 4. 支持多账号管理、一键设为当前激活账号或解绑账号。

package/bin/mcp-server.mjs

@@ -11,7 +11,7 @@ import { resolveConfig } from "../src/config.mjs";
 import { PlaywrightBrowserManager } from "../src/browser-manager.mjs";
 import { pathToFileURL } from "node:url";
 
-export const MCP_VERSION = "0.1.13";
+export const MCP_VERSION = "0.1.14";
 
 function textResult(payload) {
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taole/dd-playwright",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "description": "Standalone stdio MCP & CLI: Playwright browser automation + isolated whistle proxy + diandian account storageState injection",
   "type": "module",
   "license": "ISC",

package/src/server/web-server.mjs

@@ -337,18 +337,7 @@ const DASHBOARD_HTML = `<!DOCTYPE html>
           </button>
         </div>
         
-        <!-- 动态运行环境提示卡片 -->
-        <div id="envBanner" style="padding: 12px 16px; border-radius: 6px; margin-bottom: 20px; font-size: 13px; line-height: 1.5; {{BANNER_STYLE}}">
-          {{BANNER_CONTENT}}
-        </div>
-        <!-- 配置建议区块 -->
         {{CONFIG_SECTIONS}}
-
-        <div style="font-size: 12px; color: var(--muted); line-height: 1.6; background: #0f172a; padding: 12px; border-radius: 6px; border: 1px solid var(--border); margin-top: 20px;">
-          💡 <b>配置生效小提示：</b><br>
-          1. 挂载后启动 AI 客户端，AI 会自动识别 <code>browser_navigate</code>、<code>browser_screenshot</code> 等 13 个完整 Playwright 工具。<br>
-          2. 在本页面扫码绑定的账号，MCP 会自动读取同一个 SQLite 账号库免登运行。
-        </div>
       </div>
     </div>
 
@@ -481,10 +470,8 @@ browser_navigate({ url: "https://xdd-test.tuwan.com/", device: "desktop", userAg
 
         <div style="margin-top: 20px; padding: 16px; background: #0f172a; border-radius: 8px; border: 1px solid var(--border);">
           <div style="font-size: 14px; font-weight: 600; margin-bottom: 8px;">软件更新</div>
-          <div id="updateInfo" style="font-size: 12px; color: var(--muted); line-height: 1.8; margin-bottom: 12px;" aria-live="polite">准备检查更新…</div>
+          <div id="updateInfo" style="font-size: 12px; color: var(--muted); line-height: 1.8; margin-bottom: 12px;" aria-live="polite">点击检查更新，查看是否有新版本。</div>
           <button id="checkUpdateBtn" class="btn btn-primary" onclick="checkUpdates()">检查更新</button>
-          <button id="installUpdateBtn" class="btn btn-primary" onclick="installUpdate()" style="display:none; margin-left: 8px;">立即更新</button>
-          <div style="font-size: 12px; color: var(--muted); margin-top: 10px;">更新仅针对全局安装的 npm 包。更新完成后需重启 Web 服务及 MCP 客户端；源码运行请手动更新。</div>
         </div>
 
         <!-- Chromium 浏览器内核状态展示卡片 -->
@@ -786,63 +773,31 @@ browser_navigate({ url: "https://xdd-test.tuwan.com/", device: "desktop", userAg
     async function checkUpdates() {
       const info = document.getElementById('updateInfo');
       const check = document.getElementById('checkUpdateBtn');
-      const install = document.getElementById('installUpdateBtn');
       check.disabled = true;
-      install.style.display = 'none';
       info.textContent = '正在查询 npm 最新版本…';
       try {
         const response = await fetch('/api/update/check', { cache: 'no-store' });
         const data = await response.json();
         if (!data.ok) throw new Error(data.error || data.message || '检查失败');
-        info.textContent = '当前版本：' + data.currentVersion + '；最新版本：' + data.latestVersion + '。' + (data.message || '');
-        if (data.updateAvailable && data.canUpdate) install.style.display = 'inline-block';
+        if (!data.updateAvailable) {
+          info.textContent = '当前已是最新版本（v' + data.currentVersion + '）。';
+        } else {
+          info.textContent = '发现新版本：v' + data.currentVersion + ' → v' + data.latestVersion + '。请在终端执行 dd-pw update，更新后在 Agent 或 IDE 中重载 MCP。';
+        }
       } catch (err) {
         info.textContent = '检查更新失败：' + err.message;
       } finally { check.disabled = false; }
     }
 
-    async function installUpdate() {
-      if (!confirm('确认更新全局安装的 dd-playwright？完成后需要重启 Web 服务和 MCP 客户端。')) return;
-      const info = document.getElementById('updateInfo');
-      const install = document.getElementById('installUpdateBtn');
-      const check = document.getElementById('checkUpdateBtn');
-      install.disabled = true;
-      check.disabled = true;
-      try {
-        const response = await fetch('/api/update', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: '{}' });
-        const data = await response.json();
-        if (!data.ok) throw new Error(data.error || data.message || '无法启动更新');
-        info.textContent = data.message || '正在更新，请稍候…';
-        const poll = async () => {
-          try {
-            const state = await (await fetch('/api/update/status', { cache: 'no-store' })).json();
-            if (!state.ok) throw new Error(state.error || '查询更新状态失败');
-            info.textContent = (state.message || '正在更新…') + (state.error ? '：' + state.error : '');
-            if (state.status === 'running') { setTimeout(poll, 1500); return; }
-            if (state.status === 'success') install.style.display = 'none';
-            install.disabled = false;
-            check.disabled = false;
-          } catch (err) {
-            info.textContent = '查询更新状态失败：' + err.message + '；请稍后重新检查。';
-            install.disabled = false; check.disabled = false;
-          }
-        };
-        setTimeout(poll, 1000);
-      } catch (err) {
-        info.textContent = '更新失败：' + err.message;
-        install.disabled = false; check.disabled = false;
-      }
-    }
-
     loadAccounts();
     loadSettings();
     loadChromiumMeta();
-    checkUpdates();
   </script>
 </body>
 </html>`;
 
-export function createWebServer({ accountStore, authManager, updater = createWebUpdater() }) {
+export function createWebServer({ accountStore, authManager, updater, port = 12309 }) {
+  updater ??= createWebUpdater({ port });
   const server = createServer(async (req, res) => {
     // Update endpoints are privileged even when the listener binds 0.0.0.0.
     if (req.url?.split("?")[0].startsWith("/api/update")) {
@@ -866,21 +821,6 @@ export function createWebServer({ accountStore, authManager, updater = createWeb
       if (req.method === "GET" && path === "/api/update/check") {
         try { sendUpdate(200, { ok: true, ...await updater.check() }); }
         catch (err) { sendUpdate(502, { ok: false, error: err.message }); }
-      } else if (req.method === "GET" && path === "/api/update/status") {
-        sendUpdate(200, { ok: true, ...updater.status() });
-      } else if (req.method === "POST" && path === "/api/update") {
-        if (!/^application\/json(?:\s*;\s*charset=utf-8)?\s*$/i.test(req.headers["content-type"] || "")) {
-          sendUpdate(415, { ok: false, error: "需要 application/json" }); return;
-        }
-        let body = "";
-        for await (const chunk of req) {
-          body += chunk;
-          if (body.length > 4096) { sendUpdate(413, { ok: false, error: "请求过大" }); return; }
-        }
-        try { const data = JSON.parse(body); if (!data || typeof data !== "object" || Array.isArray(data)) throw new Error(); }
-        catch { sendUpdate(400, { ok: false, error: "需要 JSON 对象" }); return; }
-        const { started, ...result } = await updater.start();
-        sendUpdate(started ? 202 : 409, { ok: started, ...result });
       } else { sendUpdate(404, { ok: false, error: "Not Found" }); }
       return;
     }
@@ -899,8 +839,6 @@ export function createWebServer({ accountStore, authManager, updater = createWeb
 
     // 1. 首页控制台
     if (pathname === "/" || pathname === "/index.html") {
-      const currentFilePath = fileURLToPath(import.meta.url).replaceAll("\\", "/");
-      const isInstalledViaNpm = /\/node_modules\/(@taole\/)?dd-playwright\//i.test(currentFilePath);
       const serverScriptPath = fileURLToPath(
         new URL("../../bin/mcp-server.mjs", import.meta.url),
       ).replaceAll("\\", "/");
@@ -918,12 +856,9 @@ export function createWebServer({ accountStore, authManager, updater = createWeb
         2,
       );
 
-      let bannerStyle = "background: rgba(59, 130, 246, 0.12); border: 1px solid rgba(59, 130, 246, 0.3); color: #60a5fa;";
-      let bannerContent = `💻 <b>当前代码位置：</b><code style="background: rgba(0,0,0,0.3); padding: 2px 6px; border-radius: 4px; color: #93c5fd;">${serverScriptPath}</code><br><span style="color:#cbd5e1; font-size:12px; margin-top: 4px; display: inline-block;">使用 Node 绝对路径方式挂载 MCP，不受系统 PATH 或环境切换影响，100% 稳定运行。</span>`;
-
       let configSections = `
         <div class="code-title">
-          <span>本地绝对路径配置（推荐，开箱即用）</span>
+          <span>MCP 配置</span>
           <button class="copy-btn" onclick="copyCode('code-mcp-local')">复制代码</button>
         </div>
         <div id="code-mcp-local" class="code-block">${localConfigStr}</div>
@@ -938,8 +873,6 @@ export function createWebServer({ accountStore, authManager, updater = createWeb
 
       const renderedHtml = DASHBOARD_HTML
         .replace("{{VERSION}}", pkgVersion)
-        .replace("{{BANNER_STYLE}}", bannerStyle)
-        .replace("{{BANNER_CONTENT}}", bannerContent)
         .replace("{{CONFIG_SECTIONS}}", configSections);
       sendHtml(res, renderedHtml);
       return;
@@ -1122,7 +1055,7 @@ export async function startWebServer({
 } = {}) {
   const store = accountStore || new AccountStore(dbPath);
   const authManager = new DiandianAuthManager({ accountStore: store });
-  const server = createWebServer({ accountStore: store, authManager });
+  const server = createWebServer({ accountStore: store, authManager, port });
 
   return new Promise((resolve, reject) => {
     server.listen(port, "0.0.0.0", () => {

package/src/server/web-update.mjs

@@ -1,67 +1,13 @@
-import { spawn, execFile } from "node:child_process";
-import { realpath } from "node:fs/promises";
-import { promisify } from "node:util";
-import { fileURLToPath } from "node:url";
-import { join } from "node:path";
-import { PACKAGE_NAME, compareSemver, getLocalVersion, getRemoteLatestVersion } from "../updater.mjs";
+import { compareSemver, getLocalVersion, getRemoteLatestVersion } from "../updater.mjs";
 
-const execFileAsync = promisify(execFile);
-const packageDir = fileURLToPath(new URL("../../", import.meta.url));
-
-async function isGlobalInstall() {
-  try {
-    const windows = process.platform === "win32";
-    const { stdout } = await execFileAsync(windows ? process.env.ComSpec || "cmd.exe" : "npm", windows ? ["/d", "/s", "/c", "npm.cmd root -g"] : ["root", "-g"], { windowsHide: true, timeout: 10000 });
-    const [actual, global] = await Promise.all([realpath(packageDir), realpath(join(stdout.trim(), PACKAGE_NAME))]);
-    return windows ? actual.toLowerCase() === global.toLowerCase() : actual === global;
-  } catch { return false; }
-}
-
-function installGlobal() {
-  return new Promise((resolve, reject) => {
-    const windows = process.platform === "win32";
-    const child = spawn(windows ? process.env.ComSpec || "cmd.exe" : "npm", windows
-      ? ["/d", "/s", "/c", `npm.cmd install -g ${PACKAGE_NAME}@latest`]
-      : ["install", "-g", `${PACKAGE_NAME}@latest`],
-    { windowsHide: true, stdio: ["ignore", "ignore", "pipe"] });
-    let stderr = "";
-    child.stderr?.on("data", chunk => { stderr = (stderr + chunk.toString()).slice(-4000); });
-    child.once("error", reject);
-    child.once("close", (code, signal) => code === 0 ? resolve() : reject(new Error(stderr.trim() || `npm 退出: ${signal || code}`)));
-  });
-}
-
-export function createWebUpdater({ getVersion = getLocalVersion, getLatest = getRemoteLatestVersion, isGlobal = isGlobalInstall, install = installGlobal } = {}) {
-  let state = { status: "idle", error: null, message: "尚未开始更新", restartRequired: false };
+/** 仅检查版本，不执行安装或重启。 */
+export function createWebUpdater({ getVersion = getLocalVersion, getLatest = getRemoteLatestVersion } = {}) {
   return {
     async check() {
       const currentVersion = getVersion();
-      const [latestVersion, global] = await Promise.all([getLatest(), isGlobal()]);
+      const latestVersion = await getLatest();
       if (!latestVersion) throw new Error("无法查询 npm 最新版本，请检查网络");
-      return { currentVersion, latestVersion, updateAvailable: compareSemver(latestVersion, currentVersion) > 0,
-        installType: global ? "global" : "local", canUpdate: global,
-        message: global ? "更新完成后请手动重启服务" : "当前运行的不是 npm 全局安装，更新全局包不会更新此服务，请按当前安装方式手动更新" };
-    },
-    status() { return { ...state }; },
-    async start() {
-      if (state.status === "running") return { started: false, ...state };
-      state = { status: "running", error: null, message: "正在确认安装位置", restartRequired: false };
-      try {
-        if (!await isGlobal()) {
-          state = { status: "error", error: "当前服务不是 npm 全局安装，请手动更新当前安装", message: "无法自动更新", restartRequired: false };
-          return { started: false, ...state };
-        }
-        state.message = "正在安装更新，完成后请手动重启服务";
-        Promise.resolve().then(() => install()).then(() => {
-          state = { status: "success", error: null, message: "安装完成，请手动重启服务以使用新版本", restartRequired: true };
-        }, err => {
-          state = { status: "error", error: String(err?.message || err), message: "安装失败，服务仍在运行", restartRequired: false };
-        });
-        return { started: true, ...state };
-      } catch (err) {
-        state = { status: "error", error: String(err?.message || err), message: "更新启动失败", restartRequired: false };
-        return { started: false, ...state };
-      }
+      return { currentVersion, latestVersion, updateAvailable: compareSemver(latestVersion, currentVersion) > 0 };
     },
   };
 }