tt-help-cli-ycl 1.4.13 → 1.4.15

package/src/watch/server.js

@@ -93,6 +93,7 @@ function inferClientType(routePath) {
   if (routePath.startsWith("/api/redo-job")) return "refresh";
   if (routePath.startsWith("/api/user-update-tasks")) return "attach";
   if (routePath.startsWith("/api/comment-task")) return "comments";
+  if (routePath.startsWith("/api/tags/refresh")) return "tag-refresh";
   if (routePath.startsWith("/api/tags")) return "scoring";
   if (
     routePath.startsWith("/api/job") ||
@@ -142,9 +143,12 @@ export function startWatchServer(
     let discoverRunning = false;
     let lastDiscoverTime = 0;
 
-    // 标签池充足阈值：new 标签总数超过此值时，定时触发直接跳过（不浪费 LLM token）
-    const DISCOVER_SUFFICIENT_TOTAL =
-      parseInt(process.env.TAG_DISCOVER_SUFFICIENT || "30", 10) || 30;
+    // 每国标签不足阈值：某国 new 标签低于此值时触发 discover
+    const DISCOVER_PER_COUNTRY_THRESHOLD = Math.max(
+      3,
+      parseInt(process.env.TAG_DISCOVER_PER_COUNTRY_THRESHOLD || "10", 10) ||
+        10,
+    );
 
     async function runAutoDiscover(trigger = "timer") {
       if (discoverRunning) return;
@@ -156,23 +160,14 @@ export function startWatchServer(
         );
         return;
       }
-      // 先看全局总量：标签池充足时直接跳过，不浪费 LLM token
-      const globalStats = store.getTagStats();
-      const totalNew = globalStats?.new || 0;
-      if (totalNew >= DISCOVER_SUFFICIENT_TOTAL) {
-        console.error(
-          `[discover] 标签池充足 (${totalNew} 个 new ≥ ${DISCOVER_SUFFICIENT_TOTAL})，跳过 [触发: ${trigger}]`,
-        );
-        return;
-      }
       discoverRunning = true;
       try {
-        // 只为 new 标签不足的国家发现
+        // 按国家维度判断：只为 new 标签不足的国家发现
         const countriesToDiscover = [];
         const { getTagsByStatus } = await import("./db-tags.js");
         for (const country of DEFAULT_TARGET_LOCATIONS) {
           const newTags = getTagsByStatus("new", 100, 0, country);
-          if (newTags.length < 10) {
+          if (newTags.length < DISCOVER_PER_COUNTRY_THRESHOLD) {
             countriesToDiscover.push(country);
           }
         }
@@ -860,12 +855,13 @@ export function startWatchServer(
               offset: parseInt(params.offset || "0", 10),
             },
           );
-          // 确保每个用户对象包含 topVideoPlayCount 和 topVideoHref
+          // 确保每个用户对象包含 topVideoPlayCount、topVideoHref 和 topVideoIsAd
           if (result.users && Array.isArray(result.users)) {
             result.users = result.users.map((u) => ({
               ...u,
               topVideoPlayCount: u.topVideoPlayCount || null,
               topVideoHref: u.topVideoHref || null,
+              topVideoIsAd: u.topVideoIsAd ?? null,
             }));
           }
           sendJSON(res, 200, result);
@@ -874,7 +870,7 @@ export function startWatchServer(
 
         // 默认：全量（兼容旧调用）
         const result = store.getTargetUsersByCountry(DEFAULT_TARGET_LOCATIONS);
-        // 确保每个用户对象包含 topVideoPlayCount 和 topVideoHref
+        // 确保每个用户对象包含 topVideoPlayCount、topVideoHref 和 topVideoIsAd
         if (result.countries && Array.isArray(result.countries)) {
           for (const country of result.countries) {
             if (country.users && Array.isArray(country.users)) {
@@ -882,6 +878,7 @@ export function startWatchServer(
                 ...u,
                 topVideoPlayCount: u.topVideoPlayCount || null,
                 topVideoHref: u.topVideoHref || null,
+                topVideoIsAd: u.topVideoIsAd ?? null,
               }));
             }
           }
@@ -890,6 +887,17 @@ export function startWatchServer(
         return;
       }
 
+      if (
+        req.method === "GET" &&
+        routePath === "/api/target-users-other-countries"
+      ) {
+        const result = store.getModifiedTargetUsersOutsideLocations(
+          DEFAULT_TARGET_LOCATIONS,
+        );
+        sendJSON(res, 200, result);
+        return;
+      }
+
       if (req.method === "GET" && routePath === "/api/client-errors") {
         sendJSON(res, 200, { clients: store.getClientErrors() });
         return;
@@ -1327,6 +1335,71 @@ export function startWatchServer(
         return;
       }
 
+      // POST /api/bulk-author-locations — 批量查询作者国家（用于 tag 客户端 enrich 前跳过已知数据）
+      if (req.method === "POST" && routePath === "/api/bulk-author-locations") {
+        try {
+          const body = await readBody(req);
+          const uniqueIds = Array.isArray(body.uniqueIds) ? body.uniqueIds : [];
+          const locations = store.getBulkAuthorLocations(uniqueIds);
+          sendJSON(res, 200, { locations });
+        } catch (e) {
+          sendJSON(res, 500, { error: e.message });
+        }
+        return;
+      }
+
+      // GET /api/tags/refresh-task — 领取一个 productive 标签用于刷新（score>70，未被锁定）
+      if (req.method === "GET" && routePath === "/api/tags/refresh-task") {
+        const task = store.getProductiveRefreshTask();
+        if (!task) {
+          sendJSON(res, 200, {
+            tag: null,
+            message: "no productive tags available for refresh",
+          });
+          return;
+        }
+        sendJSON(res, 200, {
+          tag: task.tag,
+          score: task.score,
+          refreshedAt: task.refreshed_at,
+        });
+        return;
+      }
+
+      // POST /api/tags/refresh-claim { tag } — 锁定 productive 标签用于刷新（防并发冲突）
+      if (req.method === "POST" && routePath === "/api/tags/refresh-claim") {
+        try {
+          const body = await readBody(req);
+          const tag = (body.tag || "").trim().toLowerCase();
+          if (!tag) {
+            sendJSON(res, 400, { error: "tag 不能为空" });
+            return;
+          }
+          const result = store.claimRefreshTag(tag);
+          sendJSON(res, result.ok ? 200 : 409, result);
+        } catch (e) {
+          sendJSON(res, 500, { error: e.message });
+        }
+        return;
+      }
+
+      // POST /api/tags/refresh-result { tag, pushedUsers, error } — 报告刷新结果并解锁
+      if (req.method === "POST" && routePath === "/api/tags/refresh-result") {
+        try {
+          const body = await readBody(req);
+          const tag = (body.tag || "").trim().toLowerCase();
+          if (!tag) {
+            sendJSON(res, 400, { error: "tag 不能为空" });
+            return;
+          }
+          const result = store.reportRefreshResult(tag, body);
+          sendJSON(res, result.ok ? 200 : 400, result);
+        } catch (e) {
+          sendJSON(res, 500, { error: e.message });
+        }
+        return;
+      }
+
       // GET /api/tags/recent-generated?country=ES&lookback=10 — 最近N轮生成的标签（去重）
       if (req.method === "GET" && routePath === "/api/tags/recent-generated") {
         try {
@@ -1915,7 +1988,7 @@ export function startWatchServer(
       );
       setTimeout(() => runAutoDiscover("startup"), 30000);
       console.error(
-        `[discover] 定时+按需发现已启动: 定时间隔 ${DISCOVER_INTERVAL_MS / 60000} 分钟, 每国 ${DISCOVER_COUNT_PER_COUNTRY} 个标签, 按需阈值 ${DISCOVER_LOW_THRESHOLD}, 冷却期 ${DISCOVER_COOLDOWN_MS / 1000}s`,
+        `[discover] 定时+按需发现已启动: 定时间隔 ${DISCOVER_INTERVAL_MS / 60000} 分钟, 每国 ${DISCOVER_COUNT_PER_COUNTRY} 个标签, 每国不足阈值 ${DISCOVER_PER_COUNTRY_THRESHOLD}, 按需触发阈值 ${DISCOVER_LOW_THRESHOLD}, 冷却期 ${DISCOVER_COOLDOWN_MS / 1000}s`,
       );
 
       _resolve({ server, port });