ones-fetch 1.4.1 → 1.4.2

package/CHANGELOG.md

@@ -0,0 +1,21 @@
+# 更新日志
+
+## [1.5.0] - 2024-04-03
+
+### 新增
+- 页面加载时自动检测认证状态，无凭据时自动显示"连接 ONES"按钮
+- 安装新版本时自动清理旧文件，同时保留用户凭据和依赖包
+
+### 修复
+- 修复使用 playwright-core 后无法打开登录窗口的问题（现使用系统 Edge 浏览器）
+- 修复 Windows 下 `start` 命令无法正确处理 URL 特殊字符的问题
+- 修复前端"Assignment to constant variable"错误
+- 修复解析按钮在无凭据时未置灰的问题
+
+### 优化
+- 复制按钮固定宽度，避免文字变化时按钮大小改变
+- 默认只解析任务编号（#数字格式），不再解析 URL 中的 UUID
+- 改进错误提示信息，提供更清晰的浏览器安装指引
+
+## [1.4.1] - 之前版本
+- 基础功能实现

package/README.md

@@ -49,8 +49,7 @@ npm install
 ### 方式 1：双击启动（推荐给非技术用户）
 
 **Windows 用户：**
-- 双击 `启动 ONES 采集工具.vbs`
-- 首次运行会自动安装依赖
+- 双击桌面 `ONES 采集工具.lnk`
 - 浏览器会自动打开工具页面
 
 ### 方式 2：命令行启动
@@ -151,6 +150,8 @@ npm run dev
 
 ```
 ones-fetch/
+├── bin/
+│   └── install.mjs     # 安装依赖及快捷方式
 ├── src/
 │   ├── server.mjs      # HTTP 服务器和任务爬取逻辑
 │   └── auth.mjs        # 浏览器登录和凭证管理

package/bin/install.mjs

@@ -3,7 +3,7 @@
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
 import { homedir, platform } from 'node:os';
-import { writeFile, mkdir, cp, access } from 'node:fs/promises';
+import { writeFile, mkdir, cp, access, rm, readFile } from 'node:fs/promises';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 
@@ -17,9 +17,59 @@ const installDir = join(homedir(), '.ones-fetch');
 async function ensureInstallDir() {
   try {
     await access(installDir);
-    console.log(`使用现有安装目录: ${installDir}`);
+    console.log(`检测到现有安装目录: ${installDir}`);
+
+    // 检查版本是否需要更新
+    let needsUpdate = false;
+    try {
+      const installedPkgPath = join(installDir, 'package.json');
+      const currentPkgPath = join(projectRoot, 'package.json');
+
+      const installedPkg = JSON.parse(await readFile(installedPkgPath, 'utf8'));
+      const currentPkg = JSON.parse(await readFile(currentPkgPath, 'utf8'));
+
+      if (installedPkg.version !== currentPkg.version) {
+        console.log(`检测到版本更新: ${installedPkg.version} → ${currentPkg.version}`);
+        needsUpdate = true;
+      }
+    } catch {
+      // 如果无法读取版本信息，假设需要更新
+      needsUpdate = true;
+    }
+
+    if (needsUpdate) {
+      console.log('正在清理旧版本文件...');
+      // 清理旧的项目文件，但保留 credentials.json 和 node_modules
+      const dirsToClean = ['src', 'public', 'bin'];
+      const filesToClean = ['package.json', 'package-lock.json'];
+
+      for (const dir of dirsToClean) {
+        try {
+          await rm(join(installDir, dir), { recursive: true, force: true });
+        } catch {}
+      }
+
+      for (const file of filesToClean) {
+        try {
+          await rm(join(installDir, file), { force: true });
+        } catch {}
+      }
+
+      console.log('✓ 旧版本文件清理完成');
+      console.log('正在复制新版本文件...');
+
+      // 复制新版本文件
+      await cp(join(projectRoot, 'src'), join(installDir, 'src'), { recursive: true });
+      await cp(join(projectRoot, 'public'), join(installDir, 'public'), { recursive: true });
+      await cp(join(projectRoot, 'bin'), join(installDir, 'bin'), { recursive: true });
+      await cp(join(projectRoot, 'package.json'), join(installDir, 'package.json'));
+      await cp(join(projectRoot, 'package-lock.json'), join(installDir, 'package-lock.json')).catch(() => {});
+      console.log('✓ 新版本文件复制完成');
+    } else {
+      console.log('版本已是最新，跳过文件更新');
+    }
   } catch {
-    // 目录不存在，复制项目文件
+    // 目录不存在，首次安装
     console.log(`正在复制项目文件到 ${installDir}...`);
     await mkdir(installDir, { recursive: true });
 
@@ -78,7 +128,7 @@ async function createMacShortcut() {
 cd "${projectRoot}"
 node src/server.mjs &
 sleep 2
-open http://localhost:3000
+open http://localhost:36781
 `;
 
   await writeFile(appPath, scriptContent, 'utf8');
@@ -94,7 +144,7 @@ async function createLinuxShortcut() {
 Version=1.0
 Type=Application
 Name=ONES 采集工具
-Exec=bash -c "cd ${projectRoot} && node src/server.mjs & sleep 2 && xdg-open http://localhost:3000"
+Exec=bash -c "cd ${projectRoot} && node src/server.mjs & sleep 2 && xdg-open http://localhost:36781"
 Icon=utilities-terminal
 Terminal=false
 Categories=Utility;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ones-fetch",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "type": "module",
   "description": "ONES Fetch — Web app for recursive ONES subtask crawling",
   "bin": {

package/public/index.html

@@ -23,6 +23,7 @@
   .btn-secondary:hover:not(:disabled) { background: #d1d5db; }
   .btn-success { background: #10b981; color: #fff; }
   .btn-success:hover:not(:disabled) { background: #059669; }
+  #copyBtn { min-width: 110px; }
   .btn-link { background: #f59e0b; color: #fff; }
   .btn-link:hover:not(:disabled) { background: #d97706; }
   .status { font-size: 0.8125rem; color: #6b7280; }
@@ -115,7 +116,7 @@ function startHeartbeat() {
   if (heartbeatTimer) clearInterval(heartbeatTimer);
   heartbeatTimer = setInterval(() => {
     fetch('/api/heartbeat').catch(() => {});
-  }, 60000); // Every 60 seconds
+  }, 10000); // Every 10 seconds
 }
 
 // Stop heartbeat when page unloads
@@ -126,27 +127,56 @@ window.addEventListener('beforeunload', () => {
 // Start heartbeat on page load
 startHeartbeat();
 
+// Check auth status on page load
+async function checkInitialAuthStatus() {
+  try {
+    const resp = await fetch('/api/auth/status');
+    const data = await resp.json();
+
+    if (data.status === 'unauthenticated') {
+      updateAuthContext(data);
+      if (data.baseUrl) {
+        setAuthHint(`当前站点：${data.baseUrl}${data.teamId ? `，团队：${data.teamId}` : ''}`);
+      }
+    } else if (data.status === 'authenticated') {
+      updateAuthContext(data);
+      showAuthButton(false);
+      if (data.baseUrl) {
+        setAuthHint(`已连接：${data.baseUrl}${data.teamId ? `，团队：${data.teamId}` : ''}`);
+      }
+    }
+  } catch (e) {
+    // Ignore initial auth check errors
+  }
+}
+
+// Check auth status when page loads
+checkInitialAuthStatus();
+
 function extractContext(text) {
   const match = text.match(/(https?:\/\/[^/\s]+)\/project\/#\/team\/([^/\s]+)\/task\/([A-Za-z0-9]{10,})/);
   if (!match) return { baseUrl: '', teamId: '' };
   return { baseUrl: match[1], teamId: match[2] };
 }
 
+function getCurrentInputState() {
+  const text = document.getElementById('input').value.trim();
+  const taskIds = extractTaskIds(text);
+  const context = extractContext(text);
+  return { text, taskIds, context, hasBaseUrl: Boolean(context.baseUrl) };
+}
+
 function extractTaskIds(text) {
-  const uuids = [];
   const numbers = [];
 
-  for (const match of text.matchAll(/\/task\/([A-Za-z0-9]{10,})/g)) {
-    uuids.push(match[1]);
-  }
-
+  // 只提取 #数字 格式的编号
   const textWithoutUrls = text.replace(/https?:\/\/[^\s]+/g, '');
   for (const match of textWithoutUrls.matchAll(/#(\d+)/g)) {
     numbers.push(match[1]);
   }
 
   const seen = new Set();
-  return [...uuids, ...numbers].filter(id => {
+  return numbers.filter(id => {
     if (seen.has(id)) return false;
     seen.add(id);
     return true;
@@ -200,12 +230,24 @@ function updateProgress(current, total, message) {
 }
 
 async function parse() {
-  const text = document.getElementById('input').value.trim();
+  const { text, taskIds, context, hasBaseUrl } = getCurrentInputState();
   if (!text) { setStatus('请先粘贴文本', true); return; }
-  const taskIds = extractTaskIds(text);
-  const context = extractContext(text);
   updateAuthContext(context);
-  if (taskIds.length === 0) { setStatus('未找到任务 ID（支持 /task/UUID 链接或 #数字编号）', true); return; }
+
+  if (!hasBaseUrl) {
+    showAuthButton(false);
+    setAuthHint('');
+    setStatus('未检测到有效 ONES 地址，请粘贴正确的任务文本', true);
+    return;
+  }
+
+  if (taskIds.length === 0) {
+    showAuthButton(false);
+    setStatus('未找到任务 ID（支持 /task/UUID 链接或 #数字编号）', true);
+    setAuthHint(`已识别站点：${context.baseUrl}${context.teamId ? `，团队：${context.teamId}` : ''}`);
+    return;
+  }
+
   renderChips(taskIds);
   setStatus(`已提取 ${taskIds.length} 个任务 ID，正在抓取...`);
   setAuthHint(context.baseUrl ? `已识别站点：${context.baseUrl}${context.teamId ? `，团队：${context.teamId}` : ''}` : '');
@@ -216,7 +258,7 @@ async function parse() {
 
   try {
     // 逐个解析任务以显示进度
-    const allTasks = [];
+    const fetchedTasks = [];
     const roots = [];
 
     for (let i = 0; i < taskIds.length; i++) {
@@ -236,7 +278,7 @@ async function parse() {
         if (data.error === 'auth_required' || data.error === 'token_expired') {
           updateAuthContext(data);
           showAuthButton(true, data.error === 'token_expired' ? '重新连接 ONES' : '连接 ONES');
-          setAuthHint(`将打开一个浏览器窗口用于登录 ONES，完成后会自动重试。${authContext.baseUrl ? ` 当前站点：${authContext.baseUrl}` : ''}`);
+          setAuthHint(`已识别站点：${authContext.baseUrl}${authContext.teamId ? `，团队：${authContext.teamId}` : ''}。第一次解析前请先连接 ONES。`);
         }
         const msg = data.error === 'token_expired'
           ? '登录状态已过期，请点击”连接 ONES”重新登录'
@@ -250,12 +292,12 @@ async function parse() {
       }
 
       if (data.roots) roots.push(...data.roots);
-      if (data.tasks) allTasks.push(...data.tasks);
+      if (data.tasks) fetchedTasks.push(...data.tasks);
     }
 
     showAuthButton(false);
     updateAuthContext({ baseUrl: authContext.baseUrl, teamId: authContext.teamId });
-    allTasks = allTasks;
+    allTasks = fetchedTasks;
     collapsed = new Set();
     renderTable();
     setStatus(`共获取 ${allTasks.length} 条任务`);
@@ -270,13 +312,14 @@ async function parse() {
 }
 
 async function connectOnes() {
-  const text = document.getElementById('input').value;
-  const context = extractContext(text);
+  const { context, hasBaseUrl } = getCurrentInputState();
   updateAuthContext(context);
   const btn = document.getElementById('authBtn');
 
-  if (!authContext.baseUrl) {
-    setStatus('当前没有可用的 ONES 站点地址，请先粘贴任务链接或配置 ONES_BASE_URL', true);
+  if (!hasBaseUrl) {
+    showAuthButton(false);
+    setAuthHint('');
+    setStatus('未检测到有效 ONES 地址，请先粘贴正确的任务文本', true);
     return;
   }
 
@@ -287,7 +330,7 @@ async function connectOnes() {
   const resp = await fetch('/api/auth/login', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ baseUrl: authContext.baseUrl, teamId: authContext.teamId || undefined }),
+    body: JSON.stringify({ baseUrl: context.baseUrl, teamId: context.teamId || undefined }),
   });
   const data = await resp.json();
   if (!resp.ok) {
@@ -298,35 +341,45 @@ async function connectOnes() {
   }
 
   updateAuthContext(data);
-  setAuthHint(`已打开 ${authContext.baseUrl} 的登录窗口，登录完成后将自动重试解析。`);
+  setAuthHint(`已打开 ${context.baseUrl} 的登录窗口，登录完成后将自动重试本次解析。`);
   startAuthPolling();
 }
 
 function startAuthPolling() {
   if (authPollingTimer) window.clearInterval(authPollingTimer);
   authPollingTimer = window.setInterval(async () => {
-    const resp = await fetch('/api/auth/status');
-    const data = await resp.json();
-    if (data.status === 'pending') {
-      showAuthButton(true, '等待登录完成...');
-      document.getElementById('authBtn').disabled = true;
-      return;
-    }
+    try {
+      const resp = await fetch('/api/auth/status');
+      const data = await resp.json();
+      if (data.status === 'pending') {
+        showAuthButton(true, '等待登录完成...');
+        document.getElementById('authBtn').disabled = true;
+        return;
+      }
 
-    window.clearInterval(authPollingTimer);
-    authPollingTimer = null;
+      window.clearInterval(authPollingTimer);
+      authPollingTimer = null;
+
+      if (data.status === 'authenticated') {
+        updateAuthContext(data);
+        showAuthButton(false);
+        setStatus('ONES 已连接，正在重新解析...');
+        setAuthHint(`当前站点：${authContext.baseUrl}${authContext.teamId ? `，团队：${authContext.teamId}` : ''}`);
+        const { text, hasBaseUrl, taskIds } = getCurrentInputState();
+        if (text && hasBaseUrl && taskIds.length > 0) {
+          await parse();
+        }
+        return;
+      }
 
-    if (data.status === 'authenticated') {
-      updateAuthContext(data);
-      showAuthButton(false);
-      setStatus('ONES 已连接，正在重新解析...');
-      setAuthHint(`当前站点：${authContext.baseUrl}${authContext.teamId ? `，团队：${authContext.teamId}` : ''}`);
-      await parse();
-      return;
+      showAuthButton(true, '连接 ONES');
+      setStatus(data.error === 'LOGIN_TIMEOUT' ? '登录超时，请重试' : '登录未完成，请重试', true);
+    } catch (e) {
+      window.clearInterval(authPollingTimer);
+      authPollingTimer = null;
+      showAuthButton(true, '连接 ONES');
+      setStatus('登录状态检查失败：' + e.message, true);
     }
-
-    showAuthButton(true, '连接 ONES');
-    setStatus(data.error === 'LOGIN_TIMEOUT' ? '登录超时，请重试' : '登录未完成，请重试', true);
   }, 1500);
 }
 
@@ -427,6 +480,10 @@ function clearAll() {
   document.getElementById('status').textContent = '';
   setAuthHint('');
   showAuthButton(false);
+  if (authPollingTimer) {
+    window.clearInterval(authPollingTimer);
+    authPollingTimer = null;
+  }
   updateProgress(0, 0, '');
   authContext = { baseUrl: '', teamId: '' };
   document.getElementById('resultsSection').style.display = 'none';
@@ -435,13 +492,12 @@ function clearAll() {
 
 // Auto-extract chips on input
 document.getElementById('input').addEventListener('input', () => {
-  const text = document.getElementById('input').value;
-  const taskIds = extractTaskIds(text);
-  const context = extractContext(text);
+  const { taskIds, context, hasBaseUrl } = getCurrentInputState();
   updateAuthContext(context);
   renderChips(taskIds);
   setStatus(taskIds.length ? `检测到 ${taskIds.length} 个任务 ID` : '');
-  setAuthHint(authContext.baseUrl ? `已识别站点：${authContext.baseUrl}${authContext.teamId ? `，团队：${authContext.teamId}` : ''}` : '');
+  showAuthButton(false);
+  setAuthHint(hasBaseUrl ? `已识别站点：${context.baseUrl}${context.teamId ? `，团队：${context.teamId}` : ''}` : '');
 });
 </script>
 </body>

package/src/auth.mjs

@@ -70,16 +70,42 @@ async function extractSessionFromPage(page) {
 }
 
 export async function runBrowserLoginCapture({ baseUrl, timeoutMs = 300000, verbose = false }) {
-  const browser = await chromium.launch({ headless: false });
+  const diag = (message) => {
+    if (!verbose) return;
+    process.stdout.write(`[ones-auth] ${message}\n`);
+  };
+
+  // Use system browser: Edge on Windows, Chrome on other platforms
+  const launchOptions = {
+    headless: false,
+    channel: process.platform === 'win32' ? 'msedge' : 'chrome',
+  };
+
+  let browser;
+  try {
+    browser = await chromium.launch(launchOptions);
+  } catch (error) {
+    // If system browser fails, try without channel (requires playwright browsers installed)
+    if (verbose) process.stderr.write(`System browser launch failed, trying bundled browser: ${error.message}\n`);
+    try {
+      browser = await chromium.launch({ headless: false });
+    } catch (fallbackError) {
+      throw new Error(`Failed to launch browser. Please ensure Microsoft Edge is installed, or run: npx playwright install chromium`);
+    }
+  }
+
   const context = await browser.newContext();
   const page = await context.newPage();
   const loginUrl = getLoginUrl(baseUrl);
+  diag(`start capture baseUrl=${baseUrl} loginUrl=${loginUrl} channel=${launchOptions.channel ?? 'bundled'}`);
 
   let resolved = false;
 
   return new Promise(async (resolve, reject) => {
     const finish = async (result, error) => {
       if (resolved) return;
+      const outcome = error ? `error=${error.message}` : `success userId=${result?.userId ?? 'unknown'} teamId=${result?.teamId ?? 'unknown'}`;
+      diag(`finish ${outcome}; closing browser`);
       try {
         if (error) throw error;
         const credentialsToSave = { ...result, baseUrl };
@@ -110,6 +136,7 @@ export async function runBrowserLoginCapture({ baseUrl, timeoutMs = 300000, verb
         // Cross-page transitions can temporarily break page evaluation.
       }
       if (session?.authToken && session?.userId) {
+        diag(`session detected from page url=${page.url()} userId=${session.userId} teamId=${session.teamId ?? 'unknown'}`);
         await finish(session, null);
       }
     };
@@ -128,6 +155,7 @@ export async function runBrowserLoginCapture({ baseUrl, timeoutMs = 300000, verb
             const teamMatch = currentUrl.match(/\/team\/([a-zA-Z0-9]{16,})/);
             if (teamMatch) teamId = teamMatch[1];
           } catch { /* ignore */ }
+          diag(`session detected from response url=${res.url()} userId=${userId} teamId=${teamId ?? 'unknown'}`);
           await finish({ authToken, userId, teamId }, null);
           return;
         }
@@ -138,10 +166,12 @@ export async function runBrowserLoginCapture({ baseUrl, timeoutMs = 300000, verb
     };
 
     const onNavigation = () => {
+      diag(`navigated url=${page.url()}`);
       void tryPageSession();
     };
 
     const timeout = setTimeout(() => {
+      diag(`timeout after ${timeoutMs}ms`);
       void finish(null, new Error("LOGIN_TIMEOUT"));
     }, timeoutMs);
 
@@ -153,10 +183,11 @@ export async function runBrowserLoginCapture({ baseUrl, timeoutMs = 300000, verb
     page.on("framenavigated", onNavigation);
 
     try {
-      if (verbose) process.stderr.write(`Opening browser login at ${loginUrl}\n`);
+      diag(`goto ${loginUrl}`);
       await page.goto(loginUrl, { waitUntil: "domcontentloaded", timeout: 60000 });
       await tryPageSession();
     } catch (error) {
+      diag(`goto failed error=${error instanceof Error ? error.message : String(error)}`);
       await finish(null, error instanceof Error ? error : new Error(String(error)));
     }
   });

package/src/server.mjs

@@ -7,11 +7,19 @@ import { exec } from 'node:child_process';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const PUBLIC_DIR = join(__dirname, '..', 'public');
-const PORT = process.env.PORT ?? 3000;
+const PORT = process.env.PORT ?? 36781;
 
 function openBrowser(url) {
-  const start = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
-  exec(`${start} ${url}`);
+  let command;
+  if (process.platform === 'darwin') {
+    command = `open "${url}"`;
+  } else if (process.platform === 'win32') {
+    // On Windows, use 'start ""' with quoted URL to handle special characters
+    command = `start "" "${url}"`;
+  } else {
+    command = `xdg-open "${url}"`;
+  }
+  exec(command);
 }
 
 const authFlow = {
@@ -296,7 +304,7 @@ async function handleAuthLogin(req, res) {
   void (async () => {
     try {
       const { runBrowserLoginCapture } = await import('./auth.mjs');
-      await runBrowserLoginCapture({ baseUrl: context.baseUrl });
+      await runBrowserLoginCapture({ baseUrl: context.baseUrl, verbose: true });
       authFlow.status = 'idle';
       authFlow.error = null;
       authFlow.baseUrl = '';
@@ -367,14 +375,14 @@ async function handleCrawl(req, res) {
 
 // Heartbeat tracking
 let lastHeartbeat = Date.now();
-const HEARTBEAT_TIMEOUT = 2 * 60 * 1000; // 2 minutes
-const HEARTBEAT_CHECK_INTERVAL = 30 * 1000; // 30 seconds
+const HEARTBEAT_TIMEOUT = 30 * 1000; // 30 seconds
+const HEARTBEAT_CHECK_INTERVAL = 10 * 1000; // 10 seconds
 
 function startHeartbeatMonitor() {
   setInterval(() => {
     const now = Date.now();
     if (now - lastHeartbeat > HEARTBEAT_TIMEOUT) {
-      process.stdout.write('No heartbeat received for 5 minutes, shutting down server...\n');
+      process.stdout.write('No heartbeat received for 30 seconds, shutting down server...\n');
       process.exit(0);
     }
   }, HEARTBEAT_CHECK_INTERVAL);