|
@@ -1,5 +1,5 @@
|
|
|
/*! tiktok-auto v1.0.0
|
|
/*! tiktok-auto v1.0.0
|
|
|
- * built 2026-10-20T09:16:16.854Z
|
|
|
|
|
|
|
+ * built 2026-10-20T10:29:07.437Z
|
|
|
* modules: logger, bridge, config, wait, layout, ui, popups, tiktok, player, comment, flow, parse, uidset, filters, profile, idsource, resolve, idflow, main
|
|
* modules: logger, bridge, config, wait, layout, ui, popups, tiktok, player, comment, flow, parse, uidset, filters, profile, idsource, resolve, idflow, main
|
|
|
* 由 tools/build.js 自动生成 —— 请不要直接编辑本文件,改 src/ 后重新构建。
|
|
* 由 tools/build.js 自动生成 —— 请不要直接编辑本文件,改 src/ 后重新构建。
|
|
|
*/
|
|
*/
|
|
@@ -5890,7 +5890,10 @@ TikTokAuto.resolve = (function () {
|
|
|
|
|
|
|
|
for (var i = 0; i < total; i += 1) {
|
|
for (var i = 0; i < total; i += 1) {
|
|
|
if (settings.shouldStop && settings.shouldStop()) {
|
|
if (settings.shouldStop && settings.shouldStop()) {
|
|
|
- log.warn('resolve', '收到停止,已换 ' + map.length + '/' + total + ' 个');
|
|
|
|
|
|
|
+ /* 注意措辞:这里的 shouldStop 只反映**时长护栏**,
|
|
|
|
|
+ * 不含"提取上限已到"(那个属于抓取阶段,不该阻止收尾)。
|
|
|
|
|
+ * 早先写成"收到停止",把"跑太久"和"用户点了停止"混为一谈,排查时很误导。 */
|
|
|
|
|
+ log.warn('resolve', '到达时长上限,已换 ' + map.length + '/' + total + ' 个');
|
|
|
return { ok: true, map: map, failed: failed, stopped: true };
|
|
return { ok: true, map: map, failed: failed, stopped: true };
|
|
|
}
|
|
}
|
|
|
var name = usernames[i];
|
|
var name = usernames[i];
|
|
@@ -6158,7 +6161,21 @@ TikTokAuto.idflow = (function () {
|
|
|
|
|
|
|
|
log.step('idflow', '开始解析数字 uid:' + names.length + ' 个(每个约 2~3 秒)');
|
|
log.step('idflow', '开始解析数字 uid:' + names.length + ' 个(每个约 2~3 秒)');
|
|
|
var result = TikTokAuto.resolve.resolveAll(names, {
|
|
var result = TikTokAuto.resolve.resolveAll(names, {
|
|
|
- shouldStop: shouldStop,
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * ★ 这里**故意不传 shouldStop()**。
|
|
|
|
|
+ *
|
|
|
|
|
+ * `shouldStop()` 里含 `limitReached()` —— 那是**抓取阶段**的停止条件:
|
|
|
|
|
+ * "已经收够这么多个了,别再往外抓"。而解析 uid 是**收尾工作**,
|
|
|
|
|
+ * 恰恰是在抓满之后才需要做。
|
|
|
|
|
+ *
|
|
|
|
|
+ * 早先直接传 shouldStop(),于是设了「提取满 3 个」的用户:
|
|
|
|
|
+ * 抓满 3 个 → limitReached() 一直为真 → 解析阶段第一句就被判"收到停止"
|
|
|
|
|
+ * → 一个 uid 都换不到(实测 3 个全丢,日志只有一行"收到停止,已换 0/3")。
|
|
|
|
|
+ *
|
|
|
|
|
+ * 只保留时长护栏:用户主动停止靠 StopSignal 从 `wait.tick` 抛出,
|
|
|
|
|
+ * 不需要在这里轮询。
|
|
|
|
|
+ */
|
|
|
|
|
+ shouldStop: timeUp,
|
|
|
onProgress: function (done, total) {
|
|
onProgress: function (done, total) {
|
|
|
progress('解析 uid ' + done + '/' + total, target.extracted);
|
|
progress('解析 uid ' + done + '/' + total, target.extracted);
|
|
|
}
|
|
}
|