tt-help-cli-ycl 1.3.65 → 1.3.73

package/package.json

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

package/src/cli/attach.js

@@ -134,7 +134,9 @@ export async function handleAttach(options) {
     `[Attach] 并行数: ${attachParallel}, 空闲间隔: ${attachInterval}秒, 服务端: ${serverUrl}${countryStr}`,
   );
 
-  const scraper = new TikTokScraper(effectiveProxy || null);
+  const scraper = new TikTokScraper({
+    proxyServer: effectiveProxy || null,
+  });
   const shutdown = async (signal) => {
     if (shuttingDown) return;
     shuttingDown = true;
@@ -287,12 +289,14 @@ export async function handleAttach(options) {
                 const task = successTasks.find(
                   (t) => t.uniqueId === r.uniqueId,
                 );
-                if (task && task.info && task.info.error) {
+                const info = task?.info;
+                const sellerTag = info?.ttSeller ? " [商家ttSeller=true]" : "";
+                if (info && info.error) {
                   attachLog(
-                    `  ⚠ @${r.uniqueId} 已记录 (statusCode=${task.info.statusCode})`,
+                    `  ⚠${sellerTag} @${r.uniqueId} 已记录 (statusCode=${info.statusCode})`,
                   );
                 } else {
-                  attachLog(`  ✓ @${r.uniqueId} 已提交更新`);
+                  attachLog(`  ✓${sellerTag} @${r.uniqueId} 已提交更新`);
                 }
               } else {
                 failCount++;

package/src/cli/refresh.js

@@ -380,6 +380,7 @@ export async function handleRefresh(options) {
           maxFollowing: exploreMaxFollowing || 100,
           maxFollowers: exploreMaxFollowers || 100,
           location: exploreLocation,
+          locationMode: "refresh",
           browser,
           proxyServer: cdpOptions.proxyServer || null,
         },
@@ -405,6 +406,7 @@ export async function handleRefresh(options) {
             maxFollowing: exploreMaxFollowing || 100,
             maxFollowers: exploreMaxFollowers || 100,
             location: exploreLocation,
+            locationMode: "refresh",
             browser,
             proxyServer: cdpOptions.proxyServer || null,
           },
@@ -443,6 +445,7 @@ export async function handleRefresh(options) {
               maxFollowing: exploreMaxFollowing || 100,
               maxFollowers: exploreMaxFollowers || 100,
               location: exploreLocation,
+              locationMode: "refresh",
               browser,
               proxyServer: cdpOptions.proxyServer || null,
             },
@@ -525,10 +528,20 @@ export async function handleRefresh(options) {
 
       processedCount++;
 
-      const guessedLocation = result.locationCreated || null;
+      // refresh 模式：confirmedLocation 是二次确认的国家，写入 confirmed_location 列
+      // locationCreated 保持原始值不变
+      const refreshLocation =
+        result.confirmedLocation || result.locationCreated;
+      const guessedLocation = refreshLocation || null;
+
+      // 把 confirmedLocation 合并到 userInfo 中（通过 commitRedoJob 写入 DB）
+      const refreshUserInfo = { ...(result.userInfo || {}) };
+      if (result.confirmedLocation) {
+        refreshUserInfo.confirmedLocation = result.confirmedLocation;
+      }
 
       const payload = {
-        userInfo: result.userInfo || {},
+        userInfo: refreshUserInfo,
         discoveredFollowing: (result.discoveredFollowing || []).map((f) => ({
           handle: Array.isArray(f) ? f[0] : f,
           displayName: Array.isArray(f) ? f[1] : null,
@@ -542,7 +555,6 @@ export async function handleRefresh(options) {
         processed: result.processed,
         hasFollowData: result.hasFollowData,
         keepFollow: result.keepFollow,
-        locationCreated: result.locationCreated,
         noVideo: result.noVideo,
         collectedVideos: result.collectedVideos,
       };
@@ -555,7 +567,7 @@ export async function handleRefresh(options) {
           {
             sourceUser: username,
             videoList: result.videoList,
-            locationCreated: result.locationCreated,
+            locationCreated: refreshLocation,
             ttSeller: result.userInfo?.ttSeller || false,
           },
         );

package/src/lib/parse-ssr.mjs

@@ -70,6 +70,7 @@ export function parseUserInfo(rawHtml) {
     privateAccount: u.privateAccount,
     language: u.language,
     bio: u.signature || "",
+    bioLink: u.bioLink?.link || u.bioLink?.url || u.bioLink || null,
     avatar: u.avatarLarger || u.avatarMedium || u.avatarThumb || "",
     followerCount: s.followerCount,
     followingCount: s.followingCount,

package/src/scraper/explore-core.js

@@ -23,6 +23,7 @@ async function processExplore(page, username, options, log) {
     maxFollowing = 50,
     maxFollowers = 50,
     location = DEFAULT_TARGET_LOCATIONS_CSV,
+    locationMode = "explore", // "explore" | "refresh"
     proxyServer = null,
   } = options;
 
@@ -91,10 +92,12 @@ async function processExplore(page, username, options, log) {
       return result;
     }
 
-    // 从最多 5 个视频并发获取 locationCreated。
-    // 新规则：采样列表里只要有任一国家命中目标列表，就直接采用该国家；否则回退到众数。
-    const SAMPLE_SIZE = 5;
+    // 国家采样判断
+    // explore 模式：采样 5 个，优先命中目标国家，不匹配则回退众数 → 写 locationCreated
+    // refresh 模式：采样 7 个，纯众数逻辑 → 写 confirmedLocation（二次确认）
+    const SAMPLE_SIZE = locationMode === "refresh" ? 7 : 5;
     let locationCreated = null;
+    let confirmedLocation = null;
     let locationDecision = null;
     const sampleVideos = videoArray.slice(0, SAMPLE_SIZE);
     if (sampleVideos.length > 0) {
@@ -108,34 +111,48 @@ async function processExplore(page, username, options, log) {
         `  国家采样(${locations.length}个): [${locations.filter(Boolean).join(", ") || "无数据"}]`,
       );
       const normalizedLocations = normalizeLocationList(locations, []);
-      const matchedTargetLocation = findFirstMatchingLocation(
-        normalizedLocations,
-        locationList,
-      );
+
+      // 统计频率
       const freq = {};
       for (const key of normalizedLocations) {
         freq[key] = (freq[key] || 0) + 1;
       }
       const entries = Object.entries(freq).sort((a, b) => b[1] - a[1]);
-      if (matchedTargetLocation) {
-        locationCreated = matchedTargetLocation;
-        locationDecision = "命中目标国家";
-      } else if (entries.length > 0) {
-        locationCreated = entries[0][0];
-        locationDecision = "回退众数";
+
+      if (locationMode === "refresh") {
+        // refresh 模式：纯众数逻辑 → 写 confirmedLocation
+        if (entries.length > 0) {
+          confirmedLocation = entries[0][0];
+          locationDecision = `众数 (${entries[0][1]}次)`;
+        }
+      } else {
+        // explore 模式：优先命中目标国家，不匹配则回退众数
+        const matchedTargetLocation = findFirstMatchingLocation(
+          normalizedLocations,
+          locationList,
+        );
+        if (matchedTargetLocation) {
+          locationCreated = matchedTargetLocation;
+          locationDecision = "命中目标国家";
+        } else if (entries.length > 0) {
+          locationCreated = entries[0][0];
+          locationDecision = "回退众数";
+        }
       }
     }
 
     result.locationCreated = locationCreated || null;
+    result.confirmedLocation = confirmedLocation || null;
     log(
-      `  国家: ${result.locationCreated || "未知"}${locationDecision ? ` (${locationDecision})` : ""}`,
+      `  国家: ${result.confirmedLocation || result.locationCreated || "未知"}${locationDecision ? ` (${locationDecision})` : ""}`,
     );
 
-    // 国家筛选
-    const isTargetLocation = isLocationInList(
-      result.locationCreated,
-      locationList,
-    );
+    // 国家筛选：refresh 模式用 confirmedLocation，explore 模式用 locationCreated
+    const effectiveLocation =
+      locationMode === "refresh"
+        ? result.confirmedLocation
+        : result.locationCreated;
+    const isTargetLocation = isLocationInList(effectiveLocation, locationList);
 
     if (isTargetLocation) {
       result.keepFollow = true;