v1.0.8: 自动爬取URL规范化去重(锚点/跟踪参数/尾部斜杠/默认端口) + 修复反爬启发式误伤小页面

README.md

@@ -23,6 +23,7 @@
 
 ### 1. 前端管理界面
 - **总体统计区**：任务总数 / 运行中 / 累计运行次数 / 成功失败页面 / 图片数 / 磁盘占用
+- **🔍 基本搜索**：顶部搜索框，按网址 / 标题 / 任务名即时查找已爬内容，可直接预览文件、查看元数据、跳转任务详情
 - **🗑️ 回收站**：删除的任务统一进回收站（可恢复）；只有手动在回收站中才能彻底删除或清空，防止误删
 - **日间/夜间双主题**：右上角按钮一键切换，自动记忆选择
 - 任务卡片总览：状态、进度、统计、下次调度时间一目了然
@@ -32,7 +33,10 @@
 - 运行中的任务参数支持**热更新**（修改后从下一页起生效）
 
 ### 2. 批量爬取模式
-一次粘贴多个网址（每行一个，`#` 注释），可配置：
+一次粘贴多个网址（每行一个，`#` 注释），或点击「📂 导入网址文件」上传 .txt 文件批量导入：
+- **处理方式可选**：追加（保留已有，默认）或覆盖（清空已有）
+- 自动识别 UTF-8/GBK 编码、自动去重、自动清理行内注释
+可配置：
 - 项目名称、输出目录（默认 `out/<任务ID>`，可填绝对路径）
 - 爬取间隔（随机秒数区间，防封 IP）、单页超时
 - 失败重试次数 / 重试间隔
@@ -78,6 +82,7 @@
 | POST | `/api/tasks/<id>/resume` | 恢复 |
 | POST | `/api/tasks/<id>/stop` | 终止 |
 | GET | `/api/trash` | 回收站列表 |
+| GET | `/api/search?q=` | 基本搜索（网址/标题/任务名子串匹配，轻量） |
 | POST | `/api/trash/<id>/restore` | 从回收站恢复任务 |
 | DELETE | `/api/trash/<id>` | 彻底删除单个（默认输出目录一并清理） |
 | DELETE | `/api/trash` | 清空回收站 |

app.py

@@ -154,6 +154,19 @@ def api_tasks():
     return jsonify(tasks)
 
 
+def _clean_urls(lines):
+    """清洗网址行: 去空白, 去行内 # 注释 (URL 本身不含空格, 安全), 自动补 https 前缀"""
+    out = []
+    for u in lines or []:
+        u = str(u).split(" #")[0].strip()
+        if not u:
+            continue
+        if not u.startswith("http"):
+            u = "https://" + u
+        out.append(u)
+    return out
+
+
 @app.route("/api/tasks", methods=["POST"])
 def api_create_task():
     body = request.get_json(force=True) or {}
@@ -171,7 +184,7 @@ def api_create_task():
         "created_at": now_str(),
         "updated_at": now_str(),
         "config": {**DEFAULT_CONFIG, **(body.get("config") or {})},
-        "urls": [u.strip() for u in (body.get("urls") or []) if u.strip()],
+        "urls": _clean_urls(body.get("urls") or []),
     }
 
     if mode == "auto":
@@ -230,7 +243,7 @@ def api_update_task(tid):
         if "name" in body and str(body["name"]).strip():
             task["name"] = str(body["name"]).strip()
         if "urls" in body:
-            task["urls"] = [u.strip() for u in body["urls"] if u.strip()]
+            task["urls"] = _clean_urls(body["urls"])
         if "config" in body:
             merged = {**task.get("config", {}), **body["config"]}
             task["config"] = merged
@@ -443,6 +456,69 @@ def api_task_probe(tid):
     return jsonify(result)
 
 
+# ---------------- API: 搜索 ----------------
+
+@app.route("/api/search")
+def api_search():
+    """基本搜索: 对任务名/网址/标题做子串匹配 (仅遍历本地内存数据, 轻量)"""
+    q = (request.args.get("q") or "").strip()
+    if not q:
+        return jsonify({"q": q, "count": 0, "results": []})
+    ql = q.lower()
+    results = []
+    seen = set()
+    for task in store.load_tasks():
+        if task.get("deleted_at"):
+            continue                       # 回收站任务不参与搜索
+        auto = task.get("auto") or {}
+        task_hit = (
+            ql in (task.get("name") or "").lower()
+            or any(ql in u.lower() for u in task.get("urls", []))
+            or ql in ((auto.get("seed_url") or "").lower())
+        )
+        for run in store.get_runs(task["id"]):
+            for r in run.get("results", []):
+                url = r.get("url") or ""
+                title = r.get("title") or ""
+                if ql not in url.lower() and ql not in title.lower():
+                    continue
+                key = (task["id"], run.get("id"), url)
+                if key in seen:
+                    continue
+                seen.add(key)
+                results.append({
+                    "type": "page",
+                    "task_id": task["id"],
+                    "task_name": task.get("name", ""),
+                    "mode": task.get("mode", ""),
+                    "run_id": run.get("id", ""),
+                    "run_status": run.get("status", ""),
+                    "url": url,
+                    "title": title,
+                    "status": r.get("status", ""),
+                    "crawl_time": r.get("crawl_time", ""),
+                    "html_file": r.get("html_file", ""),
+                    "txt_file": r.get("txt_file", ""),
+                    "meta_file": r.get("meta_file", ""),
+                    "images": len(r.get("images", []) or []),
+                })
+                if len(results) >= 100:
+                    break
+            if len(results) >= 100:
+                break
+        if task_hit and len(results) < 100:
+            results.append({
+                "type": "task",
+                "task_id": task["id"],
+                "task_name": task.get("name", ""),
+                "mode": task.get("mode", ""),
+                "urls_count": len(task.get("urls", [])),
+                "created_at": task.get("created_at", ""),
+                "seed_url": auto.get("seed_url", ""),
+            })
+    return jsonify({"q": q, "count": len(results), "results": results})
+
+
 # ---------------- API: 运行记录与文件 ----------------
 
 @app.route("/api/runs/<rid>")

engine.py

@@ -37,13 +37,12 @@ _CHALLENGE_MARKS = [
 
 
 def is_challenge_page(title, html):
+    """判断是否仍在反爬验证页 (仅关键词启发, 避免误伤正常小页面)"""
     low = html.lower()
     t = (title or "").lower()
     for mark in _CHALLENGE_MARKS:
         if mark in t or mark in low:
             return True
-    if len(html) < 5000 and ("<article" not in low and "<main" not in low):
-        return True
     return False
 
 
@@ -77,6 +76,36 @@ def _settle_wait(page, timeout_s):
     return True, page.title(), page.content()
 
 
+_TRACKING_PARAMS = {
+    "utm_source", "utm_medium", "utm_campaign", "utm_term", "utm_content",
+    "fbclid", "gclid", "yclid", "mc_cid", "mc_eid", "ref", "ref_src",
+}
+
+
+def normalize_url(url):
+    """URL 规范化 (用于去重): 去锚点/跟踪参数/尾部斜杠/默认端口, host 小写"""
+    try:
+        p = urllib.parse.urlparse(str(url))
+        host = (p.hostname or "").lower()
+        if not host:
+            return str(url)
+        port = ""
+        if p.port and p.port not in (80, 443):
+            port = f":{p.port}"
+        path = p.path or "/"
+        if len(path) > 1 and path.endswith("/"):
+            path = path.rstrip("/")
+        query = ""
+        if p.query:
+            kept = [kv for kv in p.query.split("&")
+                    if kv.split("=", 1)[0].lower() not in _TRACKING_PARAMS]
+            if kept:
+                query = "?" + "&".join(kept)
+        return f"{p.scheme.lower()}://{host}{port}{path}{query}"
+    except Exception:
+        return str(url)
+
+
 def filter_links(hrefs, seed_url, include=None, exclude=None,
                  same_domain=True, use_regex=False):
     """按规则过滤链接, 返回 (included, excluded); excluded 含排除原因"""
@@ -551,18 +580,19 @@ class CrawlJob:
 
         p, browser, ctx, page, cookie_file = self._open_browser()
         queue = [(seed, 0, "")]               # (url, depth, 来源链接)
-        visited = set()
-        queued = set([seed])
+        visited = set()                        # 规范化 URL 去重
+        queued = set([normalize_url(seed)])
         idx = 0
         try:
             while queue and not self._stop.is_set():
                 self._wait_if_paused()
                 url, depth, src = queue.pop(0)
-                if url in visited:
+                key = normalize_url(url)
+                if key in visited:
                     continue
                 if len(visited) >= max_pages:
                     break
-                visited.add(url)
+                visited.add(key)
                 idx += 1
                 run["progress"]["current_url"] = url
                 run["progress"]["done"] = len(visited)
@@ -574,8 +604,9 @@ class CrawlJob:
                 self._persist()
                 if entry["status"] == "OK" and depth < max_depth:
                     for link in self._discover_links(page):
-                        if link not in visited and link not in queued:
-                            queued.add(link)
+                        lk = normalize_url(link)
+                        if lk not in visited and lk not in queued:
+                            queued.add(lk)
                             queue.append((link, depth + 1, url))
                 if entry["status"] == "OK":
                     self._delay()

static/app.js

@@ -79,10 +79,28 @@ function taskStatusBadge(t) {
   return '<span class="badge">未运行</span>';
 }
 
+const GROUPS = [
+  { key: "batch", label: "📄 批量爬取", desc: "一次性爬取指定网址列表" },
+  { key: "scheduled", label: "⏰ 定时爬取", desc: "按间隔或 cron 表达式定时执行" },
+  { key: "auto", label: "🤖 自动爬取", desc: "从起始网址自动发现链接并爬取" },
+];
+
 function renderTasks() {
   const box = $("taskList");
   $("emptyState").classList.toggle("hidden", state.tasks.length > 0);
-  box.innerHTML = state.tasks.map(taskCard).join("");
+  box.innerHTML = GROUPS.map((g) => {
+    const items = state.tasks.filter((t) => t.mode === g.key);
+    if (!items.length) return "";
+    return `
+      <div class="group">
+        <div class="group-head">
+          <span class="group-title">${g.label}</span>
+          <span class="group-desc">${g.desc}</span>
+          <span class="group-count">${items.length} 个任务</span>
+        </div>
+        <div class="task-grid">${items.map(taskCard).join("")}</div>
+      </div>`;
+  }).join("");
 }
 
 function taskCard(t) {
@@ -161,6 +179,128 @@ async function delTask(tid) {
   } catch (e) { toast(e.message, true); }
 }
 
+/* ---------------- 网址文件导入 ---------------- */
+const MAX_IMPORT_SIZE = 2 * 1024 * 1024;   // 2MB 上限
+
+async function readFileSmart(file) {
+  /* 自动识别 UTF-8 / GBK 编码 */
+  const buf = await file.arrayBuffer();
+  let text = new TextDecoder("utf-8").decode(buf);
+  if (text.includes("\uFFFD")) {
+    try { text = new TextDecoder("gbk").decode(buf); } catch (e) { /* 保留 utf-8 结果 */ }
+  }
+  return text;
+}
+
+function importUrlsText(text, mode) {
+  const ta = $("taskForm").elements["urls"];
+  const clean = (s) => s.split(" #")[0].trim();     // 去掉行内注释 (URL 不含空格, 安全)
+  const existing = new Set(
+    mode === "overwrite" ? [] : ta.value.split(/\r?\n/).map(clean).filter(Boolean)
+  );
+  const fresh = text.split(/\r?\n/).map(clean).filter(Boolean);
+  let added = 0;
+  for (const line of fresh) {
+    if (!existing.has(line)) { existing.add(line); added++; }
+  }
+  ta.value = Array.from(existing).join("\n");
+  return { total: fresh.length, added };
+}
+
+$("btnImportUrls").onclick = () => $("urlFileInput").click();
+$("urlFileInput").onchange = async (e) => {
+  const file = e.target.files && e.target.files[0];
+  e.target.value = "";                    // 允许重复选择同一文件
+  if (!file) return;
+  if (file.size > MAX_IMPORT_SIZE) {
+    toast("文件过大（上限 2MB），请拆分后导入", true);
+    return;
+  }
+  try {
+    const text = await readFileSmart(file);
+    const mode = $("importMode").value;
+    const r = importUrlsText(text, mode);
+    formDirty = true;
+    if (mode === "overwrite") {
+      toast(`已导入 ${file.name}：共 ${r.total} 行（覆盖原列表，新增 ${r.added} 条）`);
+    } else {
+      toast(`已导入 ${file.name}：共 ${r.total} 行，新增 ${r.added} 条网址（追加）`);
+    }
+  } catch (err) {
+    toast("文件读取失败: " + err.message, true);
+  }
+};
+
+/* ---------------- 搜索 ---------------- */
+async function doSearch() {
+  const q = $("searchInput").value.trim();
+  if (!q) { toast("请输入搜索关键词", true); return; }
+  try {
+    const d = await api(`/api/search?q=${encodeURIComponent(q)}`);
+    renderSearch(d);
+    showModal("searchModal");
+  } catch (e) { toast(e.message, true); }
+}
+
+function renderSearch(d) {
+  const body = $("searchBody");
+  if (!d.results.length) {
+    body.innerHTML = `<div class="empty" style="padding:40px 0"><div class="empty-icon">🔍</div><p>没有找到与「${esc(d.q)}」相关的内容</p></div>`;
+    return;
+  }
+  const items = d.results.map((r) => {
+    const badge = `<span class="badge ${esc(r.mode)}">${MODE_LABEL[r.mode] || esc(r.mode)}</span>`;
+    if (r.type === "task") {
+      return `
+      <div class="search-item">
+        <div class="row">
+          ${badge}
+          <span class="title">📋 ${esc(r.task_name)}</span>
+          <span class="badge">任务</span>
+        </div>
+        <div class="url">${r.seed_url ? "起始: " + esc(r.seed_url) : "网址 " + (r.urls_count || 0) + " 个"} · 创建于 ${esc(r.created_at || "")}</div>
+        <div class="row">
+          <button class="btn sm" onclick="searchOpenDetail('${r.task_id}')">📋 查看任务</button>
+        </div>
+      </div>`;
+    }
+    const stCls = r.status === "OK" ? "t-ok" : "t-fail";
+    const html = r.html_file ? `<span class="file-link" onclick="searchPreview('${r.task_id}','${esc(r.html_file)}','HTML: ${esc(r.url)}')">HTML</span>` : "";
+    const txt = r.txt_file ? `<span class="file-link" onclick="searchPreview('${r.task_id}','${esc(r.txt_file)}','文本: ${esc(r.url)}')">TXT</span>` : "";
+    const meta = r.meta_file ? `<span class="file-link" onclick="searchMeta('${r.task_id}','${esc(r.meta_file)}')">📋 元数据</span>` : "";
+    return `
+    <div class="search-item">
+      <div class="row">
+        ${badge}
+        <span class="title" title="${esc(r.title)}">${esc(r.title) || "（无标题）"}</span>
+        <span class="badge ${stCls}">${r.status}</span>
+        <span class="badge">${esc(r.run_status)}</span>
+        <span class="card-line">${esc(r.crawl_time || "")}</span>
+      </div>
+      <div class="url">🌐 ${esc(r.url)}${r.images ? ` · 🖼️ ${r.images}` : ""}</div>
+      <div class="row">
+        ${html}${txt}${meta}
+        <button class="btn sm" onclick="searchOpenDetail('${r.task_id}')">📋 任务详情</button>
+      </div>
+    </div>`;
+  }).join("");
+  body.innerHTML = `<div class="probe-summary"><span>关键词: <b>${esc(d.q)}</b></span><span>共 <b>${d.count}</b> 条结果</span></div>${items}`;
+}
+
+/* 搜索结果的跳转动作: 先关搜索弹窗再打开目标 */
+function searchOpenDetail(tid) {
+  hideModal("searchModal");
+  openDetail(tid);
+}
+function searchPreview(tid, path, title) {
+  hideModal("searchModal");
+  previewFile(tid, path, title);
+}
+function searchMeta(tid, metaFile) {
+  hideModal("searchModal");
+  showMeta(tid, metaFile);
+}
+
 /* ---------------- 回收站 ---------------- */
 async function openTrash() {
   try {
@@ -700,6 +840,8 @@ $("btnNew").onclick = openCreate;
 $("btnNew2").onclick = openCreate;
 $("btnRefresh").onclick = loadTasks;
 $("btnTrash").onclick = openTrash;
+$("btnSearch").onclick = doSearch;
+$("searchInput").addEventListener("keydown", (e) => { if (e.key === "Enter") doSearch(); });
 $("btnProbe").onclick = () => {
   const p = collectProbeFromForm();
   if (!p.seed_url) { toast("请先填写起始网址", true); return; }
@@ -718,6 +860,7 @@ document.querySelectorAll("[data-close-preview]").forEach((b) => b.onclick = ()
 document.querySelectorAll("[data-close-probe]").forEach((b) => b.onclick = () => hideModal("probeModal"));
 document.querySelectorAll("[data-close-meta]").forEach((b) => b.onclick = () => hideModal("metaModal"));
 document.querySelectorAll("[data-close-trash]").forEach((b) => b.onclick = () => hideModal("trashModal"));
+document.querySelectorAll("[data-close-search]").forEach((b) => b.onclick = () => hideModal("searchModal"));
 
 /* 表单改动监听 -> 脏标记 */
 $("taskForm").addEventListener("input", () => { formDirty = true; });
@@ -744,7 +887,7 @@ document.addEventListener("keydown", (e) => {
     }
     stopLogPoll();
     $("previewFrame").src = "about:blank";
-    ["detailModal", "probeModal", "metaModal", "trashModal", "previewModal"].forEach((id) => $(id).classList.add("hidden"));
+    ["detailModal", "probeModal", "metaModal", "trashModal", "searchModal", "previewModal"].forEach((id) => $(id).classList.add("hidden"));
   }
 });
 

static/index.html

@@ -10,6 +10,10 @@
 <header>
   <div class="logo">🕷️ 通用爬虫系统 <span id="version" class="version"></span></div>
   <div class="header-right">
+    <div class="search-box">
+      <input id="searchInput" placeholder="搜索网址 / 标题 / 任务名..." maxlength="100">
+      <button id="btnSearch" class="btn sm primary" title="搜索">🔍</button>
+    </div>
     <span class="status-pill" id="statusPill">运行中任务: 0</span>
     <button id="btnTheme" class="btn ghost" title="切换日间/夜间主题">☀️</button>
     <button id="btnTrash" class="btn ghost" title="回收站">🗑️ 回收站 <span id="trashCount" class="trash-count">0</span></button>
@@ -69,7 +73,17 @@
           <div class="field"><label>通知邮箱</label><input name="notify_email" value="wlq@tphai.com"></div>
         </div>
 
-        <div class="field" id="urlsField"><label>网址列表（每行一个，# 开头为注释）</label>
+        <div class="field" id="urlsField">
+          <label>网址列表（每行一个，# 开头为注释）</label>
+          <div class="row2" style="align-items:center">
+            <button type="button" class="btn sm" id="btnImportUrls">📂 导入网址文件(.txt)</button>
+            <select id="importMode" title="对已有网址的处理方式">
+              <option value="append" selected>追加（保留已有）</option>
+              <option value="overwrite">覆盖（清空已有）</option>
+            </select>
+            <span class="card-line">支持 UTF-8 / GBK，自动去重</span>
+            <input type="file" id="urlFileInput" accept=".txt,.csv,.urls,text/plain" hidden>
+          </div>
           <textarea name="urls" rows="5" placeholder="https://www.example.com/&#10;https://www.example.com/page2"></textarea>
         </div>
 
@@ -144,6 +158,17 @@
   </div>
 </div>
 
+<!-- 搜索结果弹窗 -->
+<div id="searchModal" class="modal-overlay hidden">
+  <div class="modal wide">
+    <div class="modal-head">
+      <span>🔍 搜索结果</span>
+      <button class="btn ghost sm" data-close-search>✕</button>
+    </div>
+    <div id="searchBody" class="detail-wrap"></div>
+  </div>
+</div>
+
 <!-- 回收站弹窗 -->
 <div id="trashModal" class="modal-overlay hidden">
   <div class="modal wide">

static/style.css

@@ -85,6 +85,16 @@ main { padding: 20px 24px; max-width: 1500px; margin: 0 auto; }
 .stat-num.num-run { color: var(--accent); }
 .stat-label { font-size: 12px; color: var(--muted); margin-top: 3px; }
 
+/* ---------- 分组展示 ---------- */
+.group { display: flex; flex-direction: column; gap: 12px; margin-bottom: 24px; }
+.group-head { display: flex; align-items: baseline; gap: 10px; flex-wrap: wrap; }
+.group-title { font-size: 16px; font-weight: 700; }
+.group-desc { font-size: 12px; color: var(--muted); }
+.group-count {
+  font-size: 11px; padding: 2px 10px; border-radius: 10px;
+  background: var(--panel2); border: 1px solid var(--border); color: var(--muted);
+}
+
 /* ---------- task grid ---------- */
 .task-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(380px, 1fr)); gap: 16px; }
 .card {
@@ -215,7 +225,16 @@ td.title-cell { max-width: 220px; overflow: hidden; text-overflow: ellipsis; }
 /* ---------- preview ---------- */
 #previewFrame { flex: 1; border: none; background: var(--preview-bg); border-radius: 0 0 14px 14px; }
 
-/* ---------- 回收站 ---------- */
+/* ---------------- 回收站 ---------------- */
+.search-box { display: flex; gap: 6px; align-items: center; }
+.search-box input { width: 250px; }
+.search-item {
+  border: 1px solid var(--border); border-radius: 10px; padding: 10px 12px;
+  display: flex; flex-direction: column; gap: 5px; background: var(--panel2);
+}
+.search-item .row { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
+.search-item .title { font-weight: 600; max-width: 420px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.search-item .url { color: var(--muted); word-break: break-all; font-size: 12px; }
 .trash-count {
   display: inline-block; min-width: 18px; padding: 0 5px; border-radius: 9px;
   background: var(--red); color: #fff; font-size: 11px; line-height: 18px;