tt-help-cli-ycl 1.3.82 → 1.3.84

package/package.json

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

package/src/cli/attach.js

@@ -1,9 +1,9 @@
 import { TikTokScraper } from "../lib/tiktok-scraper.mjs";
 import { CDNBlockedError } from "../lib/parse-ssr.mjs";
 import { proxy as configuredProxy } from "../lib/constants.js";
+import { createApiClient } from "../lib/api-client.js";
 import v8 from "node:v8";
 
-const MAX_RETRY_WAIT = 5 * 60 * 1000;
 const HEAP_RESTART_RATIO = 0.72;
 const MAX_TASK_BATCHES_BEFORE_RESTART = 200;
 
@@ -17,39 +17,6 @@ function attachLog(message = "") {
   console.error(`[${formatNow()}] ${message}`);
 }
 
-async function withRetry(label, fn) {
-  let backoff = 1000;
-  while (true) {
-    try {
-      return await fn();
-    } catch (err) {
-      attachLog(
-        `[连接] ${label} 失败: ${err.message}，${backoff / 1000}秒后重试...`,
-      );
-      await new Promise((r) => setTimeout(r, backoff));
-      if (backoff < MAX_RETRY_WAIT) backoff *= 2;
-    }
-  }
-}
-
-async function apiGet(url) {
-  return withRetry(`GET ${url}`, async () => {
-    const res = await fetch(url);
-    return res.json();
-  });
-}
-
-async function apiPost(url, body) {
-  return withRetry(`POST ${url}`, async () => {
-    const res = await fetch(url, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body),
-    });
-    return res.json();
-  });
-}
-
 function isBrowserClosedError(err) {
   if (!err) return false;
   const msg = err.message || err.toString() || "";
@@ -143,6 +110,8 @@ export async function handleAttach(options) {
     `[Attach] 并行数: ${attachParallel}, 空闲间隔: ${attachInterval}秒, 服务端: ${serverUrl}${countryStr}`,
   );
 
+  const { apiGet, apiPost } = createApiClient({ log: false });
+
   const scraper = new TikTokScraper({
     poolSize: attachPoolSize || 3,
     proxyServer: effectiveProxy || null,

package/src/cli/auto.js

@@ -6,6 +6,7 @@ import {
 import { userId as configuredUserId, saveUserId } from "../lib/constants.js";
 import { getMacOrUuid } from "../lib/mac-or-uuid.js";
 import { ensureBrowserReady as ensureBrowserReadyCDP } from "../lib/browser/cdp.js";
+import { createApiClient } from "../lib/api-client.js";
 
 const MAX_RETRY_WAIT = 5 * 60 * 1000;
 
@@ -24,24 +25,6 @@ async function withRetry(label, fn) {
   }
 }
 
-async function apiPost(url, body) {
-  return withRetry(`POST ${url}`, async () => {
-    const res = await fetch(url, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body),
-    });
-    return res.json();
-  });
-}
-
-async function apiGet(url) {
-  return withRetry(`GET ${url}`, async () => {
-    const res = await fetch(url);
-    return res.json();
-  });
-}
-
 export async function handleAuto(options) {
   const {
     autoUsernames,
@@ -87,6 +70,8 @@ export async function handleAuto(options) {
       console.error(`[初始化] 未检测到本地用户编号，已生成并使用: ${userId}`);
     }
 
+    const { apiGet, apiPost } = createApiClient();
+
     const runOptions = {
       collectMax: autoCollectMax,
       scrapeDepth: autoScrapeDepth,

package/src/cli/comments.js

@@ -7,6 +7,7 @@ import {
   isLocationInList,
   normalizeLocation,
 } from "../lib/target-locations.js";
+import { createApiClient } from "../lib/api-client.js";
 
 async function waitForPageReady(page, timeout = 30000) {
   const startTime = Date.now();
@@ -32,64 +33,7 @@ async function safeEvaluate(page, fn) {
   }
 }
 
-async function withRetry(label, fn, maxRetries = 3) {
-  let backoff = 2000;
-  for (let i = 0; i < maxRetries; i++) {
-    try {
-      return await fn();
-    } catch (err) {
-      if (i < maxRetries - 1) {
-        console.error(
-          `  [${label}] 失败: ${err.message}，${backoff / 1000}s 后重试...`,
-        );
-        await new Promise((r) => setTimeout(r, backoff));
-        backoff *= 2;
-      } else {
-        throw err;
-      }
-    }
-  }
-}
-
-async function apiPost(url, body) {
-  return withRetry(`POST ${url}`, async () => {
-    const res = await fetch(url, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(body),
-    });
-    if (!res.ok) {
-      const errText = await res.text();
-      throw new Error(`HTTP ${res.status}: ${errText.substring(0, 200)}`);
-    }
-    return res.json();
-  });
-}
 
-async function apiPut(url) {
-  return withRetry(`PUT ${url}`, async () => {
-    const res = await fetch(url, {
-      method: "PUT",
-      headers: { "Content-Type": "application/json" },
-    });
-    if (!res.ok) {
-      const errText = await res.text();
-      throw new Error(`HTTP ${res.status}: ${errText.substring(0, 200)}`);
-    }
-    return res.json();
-  });
-}
-
-async function apiGet(url) {
-  return withRetry(`GET ${url}`, async () => {
-    const res = await fetch(url);
-    if (!res.ok) {
-      const errText = await res.text();
-      throw new Error(`HTTP ${res.status}: ${errText.substring(0, 200)}`);
-    }
-    return res.json();
-  });
-}
 
 function isBrowserClosedError(err) {
   if (!err) return false;
@@ -110,6 +54,12 @@ function isBrowserClosedError(err) {
  */
 async function runAutoMode(options) {
   const { serverUrl, parallel, interval, maxComments } = options;
+  const { apiGet, apiPost, apiPut } = createApiClient({
+    checkStatus: true,
+    maxRetries: 2,
+    backoff: 2000,
+    log: true,
+  });
   const actualParallel = Math.max(1, parallel || 1);
   const actualInterval = interval || 10;
   const actualMaxComments = maxComments || 200;
@@ -478,6 +428,12 @@ export async function handleComments(options) {
 
       const guessedLocation = normalizeLocation(videoInfo?.locationCreated);
       const serverUrl = commentsServer || defaultServer;
+      const { apiPost } = createApiClient({
+        checkStatus: true,
+        maxRetries: 2,
+        backoff: 2000,
+        log: true,
+      });
 
       if (
         guessedLocation &&