tt-help-cli-ycl 1.3.44 → 1.3.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.3.44",
+  "version": "1.3.45",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {

package/src/cli/attach.js

@@ -76,12 +76,12 @@ async function recycleScraper(scraper, reason) {
 }
 
 export async function handleAttach(options) {
-  const { attachParallel, attachInterval, serverUrl, showHelp } = options;
+  const { attachParallel, attachInterval, serverUrl, attachCountries, showHelp } = options;
   let shuttingDown = false;
   let forceExitTimer = null;
 
   if (showHelp) {
-    attachLog("用法: tt-help attach [-p 并行数] [-i 间隔秒数] [-s 服务端地址]");
+    attachLog("用法: tt-help attach [-p 并行数] [-i 间隔秒数] [-s 服务端地址] [-c 国家列表]");
     attachLog("");
     attachLog("参数:");
     attachLog("  -p, --parallel <N>     并行抓取数（默认: 1）");
@@ -89,6 +89,9 @@ export async function handleAttach(options) {
     attachLog(
       "  -s, --server <URL>     服务端地址（默认: http://127.0.0.1:3001）",
     );
+    attachLog(
+      "  -c, --countries <A,B,C>  猜测国家列表（逗号分隔，如 PL,DE,FR），服务端优先返回这些国家的任务",
+    );
     attachLog("");
     attachLog("说明:");
     attachLog(
@@ -101,11 +104,16 @@ export async function handleAttach(options) {
     attachLog("  tt-help attach");
     attachLog("  tt-help attach -p 5 -i 10");
     attachLog("  tt-help attach -p 3 -i 5 -s http://127.0.0.1:3001");
+    attachLog("  tt-help attach -c PL,DE,FR -p 5");
     return;
   }
 
+  const countryStr =
+    attachCountries && attachCountries.length > 0
+      ? `, 猜测国家: ${attachCountries.join(", ")}`
+      : "";
   attachLog(
-    `[Attach] 并行数: ${attachParallel}, 空闲间隔: ${attachInterval}秒, 服务端: ${serverUrl}`,
+    `[Attach] 并行数: ${attachParallel}, 空闲间隔: ${attachInterval}秒, 服务端: ${serverUrl}${countryStr}`,
   );
 
   const scraper = new TikTokScraper();
@@ -162,8 +170,12 @@ export async function handleAttach(options) {
         process.exit(0);
       }
 
+      const countryParam =
+        attachCountries && attachCountries.length > 0
+          ? `&countries=${encodeURIComponent(attachCountries.join(","))}`
+          : "";
       const { total, tasks } = await apiGet(
-        `${serverUrl}/api/user-update-tasks?limit=${attachParallel}`,
+        `${serverUrl}/api/user-update-tasks?limit=${attachParallel}${countryParam}`,
       );
 
       if (!tasks || tasks.length === 0) {

package/src/lib/args.js

@@ -463,6 +463,7 @@ function parseAttachArgs(args) {
   let parallel = 1;
   let interval = 10;
   let serverUrl = defaultServer;
+  let countries = [];
 
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
@@ -472,6 +473,11 @@ function parseAttachArgs(args) {
       interval = parseInt(args[++i], 10) || 10;
     } else if (arg === "-s" || arg === "--server") {
       serverUrl = args[++i];
+    } else if (arg === "-c" || arg === "--countries") {
+      countries = args[++i]
+        .split(",")
+        .map((c) => c.trim().toUpperCase())
+        .filter(Boolean);
     }
   }
 
@@ -480,6 +486,7 @@ function parseAttachArgs(args) {
     attachParallel: parallel,
     attachInterval: interval,
     serverUrl,
+    attachCountries: countries,
     urls: [],
     outputFormat: "json",
     exploreCount: 0,

package/src/lib/constants.js

@@ -146,12 +146,14 @@ const HELP_TEXT = [
   "    示例: tt-help info https://www.tiktok.com/@nike",
   "          tt-help info https://www.tiktok.com/@nike/video/7234567890 --onlyvideo",
   "",
-  "  tt-help attach [-p 并行数] [-i 间隔秒数] [-s 服务端地址]",
+  "  tt-help attach [-p 并行数] [-i 间隔秒数] [-s 服务端地址] [-c 国家列表]",
   "    后台轮询服务端任务接口，自动抓取 TikTok 用户信息",
   "    -p, --parallel <N>     并行抓取数（默认: 1）",
   "    -i, --interval <N>     无任务时轮询间隔，单位秒（默认: 10）",
   "    -s, --server <URL>     服务端地址（默认: http://127.0.0.1:3001）",
+  "    -c, --countries <A,B>  猜测国家列表（逗号分隔，如 PL,DE,FR）",
   "    示例: tt-help attach -p 5 -i 10",
+  "          tt-help attach -c PL,DE,FR -p 5",
   "",
   "  tt-help watch -o <db路径> [-p 端口]",
   "    启动监控服务；运行期主数据仅来自 SQLite",

package/src/watch/data-store.js

@@ -990,6 +990,117 @@ function restoreRawJobsByCountry(country) {
   return { restored: count, country: normalizedCountry };
 }
 
+function restoreRawJobById(uniqueId) {
+  if (!db) {
+    return { restored: 0, uniqueId, error: "db not ready" };
+  }
+
+  const safeId = String(uniqueId).trim();
+  if (!safeId) {
+    return { restored: 0, uniqueId: safeId, error: "uniqueId is required" };
+  }
+
+  const exists =
+    db
+      .prepare("SELECT COUNT(*) as c FROM raw_jobs WHERE unique_id = ?")
+      .get(safeId)?.c || 0;
+
+  if (!exists) {
+    return { restored: 0, uniqueId: safeId };
+  }
+
+  const restoreTxn = db.transaction(() => {
+    db.prepare(
+      `
+      INSERT OR REPLACE INTO jobs (
+        unique_id, nickname, status, sources, claimed_by, claimed_at, error,
+        pinned, no_video, restricted, user_update_count, tt_seller, verified,
+        video_count, comment_count, guessed_location, location_created,
+        follower_count, following_count, heart_count, refresh_time,
+        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+      )
+      SELECT
+        unique_id, nickname, status, sources, claimed_by, claimed_at, error,
+        pinned, no_video, restricted, user_update_count, tt_seller, verified,
+        video_count, comment_count, guessed_location, location_created,
+        follower_count, following_count, heart_count, refresh_time,
+        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+      FROM raw_jobs WHERE unique_id = ?
+    `,
+    ).run(safeId);
+
+    db.prepare("DELETE FROM raw_jobs WHERE unique_id = ?").run(safeId);
+  });
+
+  restoreTxn();
+  return { restored: 1, uniqueId: safeId };
+}
+
+function restoreRawJobsByFilter({ search, location }) {
+  if (!db) {
+    return { restored: 0, error: "db not ready" };
+  }
+
+  const where = [];
+  const args = [];
+
+  if (search) {
+    where.push(
+      "(LOWER(unique_id) LIKE ? OR LOWER(COALESCE(nickname, '')) LIKE ?)",
+    );
+    const likeVal = `%${search.toLowerCase()}%`;
+    args.push(likeVal, likeVal);
+  }
+
+  if (location) {
+    where.push("COALESCE(guessed_location, '未知') = ?");
+    args.push(location);
+  }
+
+  if (where.length === 0) {
+    return { restored: 0, error: "at least one filter is required" };
+  }
+
+  const whereSql = where.join(" AND ");
+
+  const count =
+    db
+      .prepare(
+        `SELECT COUNT(*) as c FROM raw_jobs WHERE ${whereSql}`,
+      )
+      .get(...args)?.c || 0;
+
+  if (!count) {
+    return { restored: 0 };
+  }
+
+  const restoreTxn = db.transaction(() => {
+    db.prepare(
+      `
+      INSERT OR REPLACE INTO jobs (
+        unique_id, nickname, status, sources, claimed_by, claimed_at, error,
+        pinned, no_video, restricted, user_update_count, tt_seller, verified,
+        video_count, comment_count, guessed_location, location_created,
+        follower_count, following_count, heart_count, refresh_time,
+        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+      )
+      SELECT
+        unique_id, nickname, status, sources, claimed_by, claimed_at, error,
+        pinned, no_video, restricted, user_update_count, tt_seller, verified,
+        video_count, comment_count, guessed_location, location_created,
+        follower_count, following_count, heart_count, refresh_time,
+        processed, processed_at, created_at, updated_at, region, signature, sec_uid
+      FROM raw_jobs WHERE ${whereSql}
+    `,
+    ).run(...args);
+
+    db.prepare(`DELETE FROM raw_jobs WHERE ${whereSql}`).run(...args);
+  });
+
+  restoreTxn();
+  return { restored: count };
+}
+
 function getRawJobsPageFromDb({ search, location, limit, offset }) {
   if (!db) return null;
 
@@ -2474,21 +2585,33 @@ export function createStore(filePath) {
     return Array.from(clientErrors.values());
   }
 
-  function getPendingUserUpdateTasks(limit) {
+  function getPendingUserUpdateTasks(limit, countries) {
+    const targetCountries = countries
+      ? countries.map((c) => String(c).trim().toUpperCase())
+      : [];
+    const hasCountryFilter = targetCountries.length > 0;
+
     if (db) {
       const l = Math.max(1, parseInt(limit) || 5);
-      const rows = db
-        .prepare(
-          `
-          SELECT *
-          FROM jobs
-          WHERE COALESCE(tt_seller, '') = ''
-            AND COALESCE(user_update_count, 0) <= 0
-          ORDER BY created_at ASC, unique_id ASC
-          LIMIT ?
-        `,
-        )
-        .all(l);
+
+      let sql = `
+        SELECT *
+        FROM jobs
+        WHERE COALESCE(tt_seller, '') = ''
+          AND COALESCE(user_update_count, 0) <= 0
+      `;
+      const sqlParams = [];
+
+      if (hasCountryFilter) {
+        const placeholders = targetCountries.map(() => "?").join(", ");
+        sql += ` AND UPPER(COALESCE(guessed_location, '')) IN (${placeholders})`;
+        sqlParams.push(...targetCountries);
+      }
+
+      sql += ` ORDER BY created_at ASC, unique_id ASC LIMIT ?`;
+      sqlParams.push(l);
+
+      const rows = db.prepare(sql).all(...sqlParams);
       if (rows.length === 0) return [];
       const now = Date.now();
       const bumpStmt = db.prepare(
@@ -2520,9 +2643,16 @@ export function createStore(filePath) {
         const ttSellerEmpty =
           u.ttSeller === null || u.ttSeller === undefined || u.ttSeller === "";
         if (!ttSellerEmpty) return false;
-        return (
+        if (
           updateCount === null || updateCount === undefined || updateCount <= 0
-        );
+        ) {
+          if (hasCountryFilter) {
+            const loc = (u.guessedLocation || "").toUpperCase();
+            return targetCountries.includes(loc);
+          }
+          return true;
+        }
+        return false;
       })
       .slice(0, l);
     // 接受任务时 userUpdateCount + 1
@@ -2814,6 +2944,8 @@ export function createStore(filePath) {
     moveJobsToRawByCountry,
     restoreAttachStuckByCountry,
     restoreRawJobsByCountry,
+    restoreRawJobById,
+    restoreRawJobsByFilter,
     getUsersPage: getUsersPageFromDb,
     getRawJobsPage: getRawJobsPageFromDb,
     getTargetUsers: getTargetUsersFromDb,

package/src/watch/public/index.html

@@ -1265,6 +1265,7 @@
             <option value="">全部国家</option>
           </select>
           <button onclick="clearRawFilters()">清空筛选</button>
+          <button onclick="restoreFilteredRawJobs()" style="background:#22c55e;color:#fff;border:none;padding:6px 12px;border-radius:6px;cursor:pointer;font-size:12px;">恢复当前筛选到 jobs</button>
         </div>
         <div class="table-scroll">
           <table>
@@ -1279,6 +1280,7 @@
                 <th>来源</th>
                 <th>状态</th>
                 <th>创建时间</th>
+                <th>操作</th>
               </tr>
             </thead>
             <tbody id="rawTable"></tbody>
@@ -2181,7 +2183,7 @@
     function renderRawJobsTable(users) {
       const el = document.getElementById('rawTable');
       if (!users.length) {
-        el.innerHTML = '<tr><td colspan="9" style="color:#666;text-align:center;padding:24px">暂无毛料库任务</td></tr>';
+        el.innerHTML = '<tr><td colspan="10" style="color:#666;text-align:center;padding:24px">暂无毛料库任务</td></tr>';
         return;
       }
       el.innerHTML = users.map(u => {
@@ -2203,6 +2205,7 @@
           <td data-label="来源">${sources || '-'}</td>
           <td data-label="状态">${statusTag}</td>
           <td data-label="创建时间" style="font-size:11px;color:#888">${created}</td>
+          <td data-label="操作" style="text-align:center"><button onclick="restoreRawJob('${u.uniqueId}')" style="background:#22c55e;color:#fff;border:none;padding:4px 10px;border-radius:4px;cursor:pointer;font-size:11px;">恢复</button></td>
         </tr>`;
       }).join('');
     }
@@ -2237,6 +2240,63 @@
       fetchRawJobs();
     }
 
+    async function restoreRawJob(uniqueId) {
+      if (!window.confirm(`确认将 @${uniqueId} 从毛料库恢复到 jobs 队列吗？`)) {
+        return;
+      }
+      try {
+        const res = await fetch('/api/raw-jobs/restore', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ uniqueId })
+        });
+        const data = await res.json();
+        if (!res.ok || data.error) {
+          showToast(data.error || '恢复失败', true);
+          return;
+        }
+        showToast(`@${uniqueId} 已恢复到队列`);
+        await fetchStats();
+        await fetchRawByCountry();
+        await fetchRawJobs();
+      } catch (e) {
+        showToast('恢复失败: ' + e.message, true);
+      }
+    }
+
+    async function restoreFilteredRawJobs() {
+      const search = document.getElementById('rawSearchInput').value.trim();
+      const location = currentRawLocation;
+      let desc = '当前筛选条件';
+      if (search && location) desc = `搜索="${search}" + 国家=${location}`;
+      else if (search) desc = `搜索="${search}"`;
+      else if (location) desc = `国家=${location}`;
+      if (!window.confirm(`确认将毛料库中符合【${desc}】的任务恢复到 jobs 队列吗？`)) {
+        return;
+      }
+      try {
+        const body = {};
+        if (search) body.search = search;
+        if (location) body.location = location;
+        const res = await fetch('/api/raw-jobs/restore', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify(body)
+        });
+        const data = await res.json();
+        if (!res.ok || data.error) {
+          showToast(data.error || '恢复失败', true);
+          return;
+        }
+        showToast(`已恢复 ${data.restored} 条任务到队列`);
+        await fetchStats();
+        await fetchRawByCountry();
+        await fetchRawJobs();
+      } catch (e) {
+        showToast('恢复失败: ' + e.message, true);
+      }
+    }
+
     async function restoreRawJobsByCountry(country, count) {
       const countText = count != null ? `将恢复 ${formatStatNum(count)} 条。` : '';
       if (!window.confirm(`确认将 ${country} 从毛料库恢复到 jobs 队列吗？${countText}`)) {

package/src/watch/server.js

@@ -333,9 +333,12 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
 
       if (req.method === "GET" && routePath === "/api/user-update-tasks") {
         const limit = params.limit;
-        const tasks = store.getPendingUserUpdateTasks(limit);
+        const countries = params.countries
+          ? params.countries.split(",").map((c) => c.trim().toUpperCase()).filter(Boolean)
+          : [];
+        const tasks = store.getPendingUserUpdateTasks(limit, countries);
         const ts = new Date().toISOString().slice(11, 19);
-        console.error(`[JOB ${ts}] USER-UPDATE-TASKS: ${tasks.length} tasks`);
+        console.error(`[JOB ${ts}] USER-UPDATE-TASKS: ${tasks.length} tasks${countries.length ? ` (countries: ${countries.join(",")})` : ""}`);
         sendJSON(res, 200, { total: tasks.length, tasks });
         return;
       }
@@ -540,7 +543,20 @@ export function startWatchServer(dataAnchor, port = 3000, existingStore) {
       if (req.method === "POST" && routePath === "/api/raw-jobs/restore") {
         try {
           const body = await readBody(req);
-          const result = store.restoreRawJobsByCountry(body.country);
+          let result;
+          if (body.uniqueId) {
+            result = store.restoreRawJobById(body.uniqueId);
+          } else if (body.search || body.location) {
+            result = store.restoreRawJobsByFilter({
+              search: body.search || "",
+              location: body.location || "",
+            });
+          } else if (body.country) {
+            result = store.restoreRawJobsByCountry(body.country);
+          } else {
+            sendJSON(res, 400, { error: "missing filter: uniqueId, country, or search/location" });
+            return;
+          }
           if (result.error) {
             sendJSON(res, 400, result);
             return;