tt-help-cli-ycl 1.3.17 → 1.3.19

package/package.json

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

package/scripts/run-explore copy.bat

@@ -0,0 +1,68 @@
+@ECHO OFF
+SETLOCAL
+
+SET "PACKAGENAME=tt-help-cli-ycl"
+SET "TARGET_SERVER=http://117.71.53.99:17301"
+SET "CONFIG_PATH=%USERPROFILE%\.tt-help.json"
+
+ECHO ========================================
+ECHO   tt-help-cli-ycl one-click launcher (Windows CMD)
+ECHO ========================================
+
+REM ---------- 1. Check/install latest version ----------
+FOR /F "delims=" %%V IN ('npm view %PACKAGENAME% version 2^>nul') DO SET "LATEST_VERSION=%%V"
+
+IF NOT DEFINED LATEST_VERSION (
+    ECHO [ERROR] Cannot get latest version from npm
+    EXIT /B 1
+)
+
+FOR /F "tokens=2 delims=@" %%V IN ('npm list -g %PACKAGENAME% --depth=0 2^>nul ^| findstr /i "%PACKAGENAME%"') DO SET "INSTALLED_VERSION=%%V"
+
+IF NOT DEFINED INSTALLED_VERSION (
+    ECHO [INFO] %PACKAGENAME% not installed, installing latest...
+    CALL npm install -g %PACKAGENAME%
+    IF %ERRORLEVEL% EQU 0 (
+        ECHO [OK] Installed: %LATEST_VERSION%
+    ) ELSE (
+        ECHO [ERROR] Install failed, run manually: npm install -g %PACKAGENAME%
+        EXIT /B 1
+    )
+) ELSE IF "%INSTALLED_VERSION%"=="%LATEST_VERSION%" (
+    ECHO [OK] %PACKAGENAME% is up to date: %LATEST_VERSION%
+) ELSE (
+    ECHO [INFO] Current: %INSTALLED_VERSION%, Latest: %LATEST_VERSION%
+    ECHO [INFO] Upgrading to latest...
+    CALL npm install -g %PACKAGENAME%
+    IF %ERRORLEVEL% EQU 0 (
+        ECHO [OK] Upgraded: %LATEST_VERSION%
+    ) ELSE (
+        ECHO [WARN] Upgrade failed, run manually: npm install -g %PACKAGENAME%
+    )
+)
+
+REM ---------- 2. Check/set server config ----------
+SET "CURRENT_SERVER="
+IF EXIST "%CONFIG_PATH%" (
+    FOR /F "delims=" %%S IN ('node -e "try{const c=JSON.parse(require('fs').readFileSync('%CONFIG_PATH%','utf-8'));console.log(c.server||'')}catch(e){}" 2^>nul') DO SET "CURRENT_SERVER=%%S"
+)
+
+IF "%CURRENT_SERVER%"=="%TARGET_SERVER%" (
+    ECHO [OK] Server config is correct: %TARGET_SERVER%
+) ELSE (
+    IF "%CURRENT_SERVER%"=="" (
+        ECHO [INFO] Current server: not set, target: %TARGET_SERVER%
+    ) ELSE (
+        ECHO [INFO] Current server: %CURRENT_SERVER%, target: %TARGET_SERVER%
+    )
+    ECHO [INFO] Setting server config...
+    node -e "const fs=require('fs'),path=require('path');const p=path.join(require('os').homedir(),'.tt-help.json');let c={};try{c=JSON.parse(fs.readFileSync(p,'utf-8'))}catch(e){}c.server='%TARGET_SERVER%';fs.writeFileSync(p,JSON.stringify(c,null,2),'utf-8');console.log('  Written to: '+p);"
+    ECHO [OK] Server config set
+)
+
+REM ---------- 3. Start tt-help explore ----------
+ECHO.
+ECHO ========================================
+ECHO   Starting tt-help explore
+ECHO ========================================
+tt-help explore --port 9223 --profile p9223

package/src/cli/attach.js

@@ -22,10 +22,11 @@ async function apiGet(url) {
   });
 }
 
-async function apiPut(url, body) {
-  return withRetry(`PUT ${url}`, async () => {
+
+async function apiPost(url, body) {
+  return withRetry(`POST ${url}`, async () => {
     const res = await fetch(url, {
-      method: 'PUT',
+      method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(body),
     });
@@ -111,37 +112,56 @@ export async function handleAttach(options) {
         })
       );
 
-      let successCount = 0;
-      let failCount = 0;
-      let needRestart = false;
-
-      for (const result of results) {
-        if (result.status === 'fulfilled') {
-          const { uniqueId, info, error } = result.value;
-          if (error) {
-            if (isBrowserClosedError(error)) {
-              needRestart = true;
-            }
-            console.error(`  ✗ @${uniqueId} 获取失败: ${error.message || '未知错误'}`);
-            failCount++;
-          } else if (info) {
-            try {
-              await apiPut(`${serverUrl}/api/user-info/${encodeURIComponent(uniqueId)}`, info);
-              console.error(`  ✓ @${uniqueId} 已提交更新`);
-              successCount++;
-            } catch (err) {
-              console.error(`  ✗ @${uniqueId} 提交失败: ${err.message}`);
-              failCount++;
-            }
-          } else {
-            console.error(`  ✗ @${uniqueId} 未获取到用户信息`);
-            failCount++;
-          }
-        } else {
-          console.error(`  ✗ 任务执行异常: ${result.reason?.message || '未知错误'}`);
-          failCount++;
-        }
-      }
+       let successCount = 0;
+       let failCount = 0;
+       let needRestart = false;
+
+       // 收集抓取成功的任务，记录抓取失败的
+       const successTasks = [];
+       for (const result of results) {
+         if (result.status === 'fulfilled') {
+           const { uniqueId, info, error } = result.value;
+           if (error) {
+             if (isBrowserClosedError(error)) {
+               needRestart = true;
+             }
+             console.error(`  ✗ @${uniqueId} 获取失败: ${error.message || '未知错误'}`);
+             failCount++;
+           } else if (info) {
+             successTasks.push({ uniqueId, info });
+           } else {
+             console.error(`  ✗ @${uniqueId} 未获取到用户信息`);
+             failCount++;
+           }
+         } else {
+           console.error(`  ✗ 任务执行异常: ${result.reason?.message || '未知错误'}`);
+           failCount++;
+         }
+       }
+
+       // 批量提交成功的结果
+       if (successTasks.length > 0) {
+         try {
+           const batchRet = await apiPost(`${serverUrl}/api/user-info-batch`, { updates: successTasks });
+           if (batchRet && batchRet.results) {
+             for (const r of batchRet.results) {
+               if (r.ok) {
+                 successCount++;
+                 console.error(`  ✓ @${r.uniqueId} 已提交更新`);
+               } else {
+                 failCount++;
+                 console.error(`  ✗ @${r.uniqueId} 提交失败: ${r.error}`);
+               }
+             }
+           } else {
+             successCount = successTasks.length;
+             console.error(`  ✓ 批量提交完成 (${successTasks.length} 条)`);
+           }
+         } catch (err) {
+           failCount += successTasks.length;
+           console.error(`  ✗ 批量提交失败: ${err.message}`);
+         }
+       }
 
       console.error(`  本批结果: ${successCount} 成功, ${failCount} 失败\n`);
 

package/src/watch/data-store.js

@@ -138,44 +138,69 @@ export function createStore(filePath) {
     }
   }
 
+  // 异步 save：不阻塞事件循环，排队保证顺序
+  // 多次 save 调用之间如果已有 save 在进行，只标记需要再次保存
+  let saveInFlight = false;
+  let pendingSave = false;
+
   function save() {
     if (!filePath) return;
+    if (saveInFlight) {
+      pendingSave = true;
+      return;
+    }
+    doSave();
+  }
+
+  async function doSave() {
+    saveInFlight = true;
     const resolved = path.resolve(filePath);
 
-    // 将 done 用户归档到独立文件
-    if (doneArchivePath && data.length > 1000) {
-      const active = [];
-      const toArchive = [];
-      for (const u of data) {
-        if (u.status === 'done') {
-          toArchive.push(u);
-        } else {
-          active.push(u);
+    try {
+      // 将 done 用户归档到独立文件
+      if (doneArchivePath && data.length > 1000) {
+        const active = [];
+        const toArchive = [];
+        for (const u of data) {
+          if (u.status === 'done') {
+            toArchive.push(u);
+          } else {
+            active.push(u);
+          }
         }
-      }
-      if (toArchive.length > 0) {
-        doneArchive = doneArchive.concat(toArchive);
-        data = active;
-        rebuildIndex();
-        // 重建 done 归档索引
-        doneUidIndex = new Map();
-        for (let i = 0; i < doneArchive.length; i++) {
-          doneUidIndex.set(doneArchive[i].uniqueId, i);
+        if (toArchive.length > 0) {
+          doneArchive = doneArchive.concat(toArchive);
+          data.length = 0;
+          data.push(...active);
+          rebuildIndex();
+          doneUidIndex = new Map();
+          for (let i = 0; i < doneArchive.length; i++) {
+            doneUidIndex.set(doneArchive[i].uniqueId, i);
+          }
         }
       }
-    }
 
-    const json = JSON.stringify(data);
-    const tmpPath = resolved + '.tmp';
-    fs.writeFileSync(tmpPath, json, 'utf-8');
-    fs.renameSync(tmpPath, resolved);
-
-    // 写 done 归档
-    if (doneArchivePath && doneArchive.length > 0) {
-      const doneJson = JSON.stringify(doneArchive);
-      const doneTmp = doneArchivePath + '.tmp';
-      fs.writeFileSync(doneTmp, doneJson, 'utf-8');
-      fs.renameSync(doneTmp, doneArchivePath);
+      const json = JSON.stringify(data);
+      const tmpPath = resolved + '.tmp';
+      await fs.promises.writeFile(tmpPath, json, 'utf-8');
+      await fs.promises.rename(tmpPath, resolved);
+
+      // 写 done 归档
+      if (doneArchivePath && doneArchive.length > 0) {
+        const doneJson = JSON.stringify(doneArchive);
+        const doneTmp = doneArchivePath + '.tmp';
+        await fs.promises.writeFile(doneTmp, doneJson, 'utf-8');
+        await fs.promises.rename(doneTmp, doneArchivePath);
+      }
+    } catch (e) {
+      console.error(`[DataStore] save error: ${e.message}`);
+    } finally {
+      saveInFlight = false;
+      // 如果有排队的 save，继续执行
+      if (pendingSave) {
+        pendingSave = false;
+        doSave();
+      }
     }
   }
 
@@ -605,6 +630,28 @@ export function createStore(filePath) {
     return { ok: true, userUpdateCount: user.userUpdateCount };
   }
 
+  function batchUpdateUserInfo(updates) {
+    const results = [];
+    for (const item of updates) {
+      const user = getUser(item.uniqueId);
+      if (!user) {
+        results.push({ uniqueId: item.uniqueId, error: 'user not found' });
+        continue;
+      }
+      for (const key of Object.keys(item.info)) {
+        if (key === 'uniqueId' || key === 'sources') continue;
+        if (item.info[key] !== undefined && item.info[key] !== null && item.info[key] !== '') {
+          user[key] = item.info[key];
+        }
+      }
+      user.userUpdateCount = (user.userUpdateCount || 0) + 1;
+      user.updatedAt = Date.now();
+      results.push({ uniqueId: item.uniqueId, ok: true, userUpdateCount: user.userUpdateCount });
+    }
+    save();
+    return results;
+  }
+
   // 视频登记
   function registerVideos(sourceUser, videoList, locationCreated, ttSeller) {
     if (!videoList || !Array.isArray(videoList) || videoList.length === 0) {
@@ -649,7 +696,7 @@ export function createStore(filePath) {
     getPendingUsers, getProcessedUsers, getAllUsers, getStats,
     claimNextJob, commitJob, commitNewExplore, resetJob, togglePin,
     getNextRedoJob, commitRedoJob,
-    getPendingUserUpdateTasks, updateUserInfo,
+    getPendingUserUpdateTasks, updateUserInfo, batchUpdateUserInfo,
     reportClientError, deleteClientError, getClientErrors,
     registerVideos, getVideos, getVideoCount,
     stopBackup,

package/src/watch/server.js

@@ -309,7 +309,23 @@ export function startWatchServer(outputFile, port = 3000, existingStore) {
         return;
       }
 
-      const userInfoCommitMatch = routePath.match(/^\/api\/user-info\/([^/]+)$/);
+       if (req.method === 'POST' && routePath === '/api/user-info-batch') {
+          try {
+            const body = await readBody(req);
+            const updates = body.updates || [];
+            const results = store.batchUpdateUserInfo(updates);
+            const okCount = results.filter(r => r.ok).length;
+            const errCount = results.filter(r => r.error).length;
+            const ts = new Date().toISOString().slice(11, 19);
+            console.error(`[JOB ${ts}] USER-INFO-BATCH: ${okCount} ok, ${errCount} error (total=${updates.length})`);
+            sendJSON(res, 200, { results, total: updates.length, ok: okCount, error: errCount });
+          } catch (e) {
+            sendJSON(res, 400, { error: e.message });
+          }
+          return;
+        }
+
+       const userInfoCommitMatch = routePath.match(/^\/api\/user-info\/([^/]+)$/);
       if (req.method === 'PUT' && userInfoCommitMatch) {
         const uniqueId = userInfoCommitMatch[1];
         try {