feat(护栏三面): 鉴权盲区启动自检 + SQL 分层口径落码 + 六页等待循环合一
后端
- AdminApiGuardFilter 增 guardedPrefixes()/matchesPrefix() 公开入口(原 private,
自检抄一份清单迟早与守卫脱钩);行为零变化
- 新增 ApiGuardCoverageAuditor:启动期把"已映射端点既不在守卫前缀名单、也不在
公开/待收清单里"打成 API_GUARD_UNCOVERED 一行 WARN,供现网巡检 grep;
PUBLIC_BY_DESIGN 与 PENDING_CONVERGENCE 两张清单逐条写理由(只读不拦)
- SQL 分层按新口径落码:AsinResultCacheMapper 的两条动态 SQL(<foreach> 批量 +
ON DUPLICATE KEY UPDATE + 逐列 COALESCE)迁到 resources/mapper/asincache/,
注解摘干净(注解+XML 同名会让启动期抛重复语句)
- 判据:SqlLayeringConventionTest(注解写 SQL 基线 16 接口/29 条只减不增、
@Select 65 条/16 文件、wrapper 夹带函数级 SQL 4 文件/15 条,last("LIMIT n")
205 处显式豁免并反向钉住豁免面)、ApiGuardCoverageAuditorTest(含清单腐烂与
欠账/名单重叠两类反向失明)、AsinResultCacheMapperXmlTest(真解析 XML 向
BoundSql 断言 28 个占位符与 5 个 COALESCE 列)
用户端 frontend-vue
- 终态集合合一:实测六页里 PriceTrack/ProductRisk 只认 SUCCESS|FAILED,
而 COMPLETED≡SUCCESS 早有出处(task-status-text 两者都译「已完成」,
后端 TaskCenterQueryMapper SUCCESS_STATUSES_ORDERED 也含 COMPLETED)
⇒ 窄集合页收到 COMPLETED 会空转到瞬断预算耗尽,PriceTrack 的轮询摘除路径
同样窄 ⇒ 任务永不退出轮询、列表卡在"执行中"
- 新增 shared/utils/task-terminal.ts 循环骨架(disposed/瞬断预算/恢复提示/
每轮 sleep/非瞬断上抛),六页全部接上;取数、文案、快照合并、DELETED 语义
留在各页回调,没有顺手统一
- 判据两支:骨架 8 例契约 + 六页源码窄集合回归钉(含"判据自己先自证"一例,
loop-run 的 STOPPED 词表不误报)
This commit is contained in:
@@ -308,7 +308,20 @@ public class AdminApiGuardFilter extends OncePerRequestFilter {
|
||||
return false;
|
||||
}
|
||||
|
||||
private static boolean matchesPrefix(String uri, String prefix) {
|
||||
/**
|
||||
* 本过滤器实际看守的全部前缀,供启动期自检 {@link ApiGuardCoverageAuditor} 取用。
|
||||
* 清单只在这里汇总一次——自检抄一份就会和守卫慢慢脱钩。
|
||||
*/
|
||||
public static java.util.List<String> guardedPrefixes() {
|
||||
java.util.List<String> all = new java.util.ArrayList<>();
|
||||
all.add(ADMIN_API_PREFIX);
|
||||
all.add(DEBUG_PREFIX);
|
||||
all.addAll(java.util.List.of(USER_TOOL_PREFIXES));
|
||||
all.addAll(java.util.List.of(SELF_SERVICE_PREFIXES));
|
||||
return all;
|
||||
}
|
||||
|
||||
public static boolean matchesPrefix(String uri, String prefix) {
|
||||
return uri.equals(prefix) || uri.startsWith(prefix + "/");
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
package com.nanri.aiimage.config;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.context.event.ApplicationReadyEvent;
|
||||
import org.springframework.context.event.EventListener;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
|
||||
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 启动期自检:把"有哪些已映射的端点既不在 {@link AdminApiGuardFilter} 的看守前缀里、
|
||||
* 也不在明知公开的清单里"变成一条会进日志、会被巡检抓到的记录。
|
||||
*
|
||||
* <p>为什么需要它:SecurityConfig 全局 permitAll,鉴权只有两道——过滤器的前缀名单,和控制器里
|
||||
* 散着的 {@code require*} 调用。前者是常量、后者没有清单,**没有任何东西在数"两道都不沾"是谁**。
|
||||
* 于是新增一个 {@code @RestController} 挂在没人看守的前缀下时不报错、不变红,只是安静地匿名可达。
|
||||
* 2026-10-08 按控制器盘出 13 个基路径不在名单里,其中 6 个与名单内那 15 条同形状,只是没人记账。
|
||||
*
|
||||
* <p>口径(前缀匹配语义与 {@link AdminApiGuardFilter#matchesPrefix} 完全一致,共用同一个方法):
|
||||
* <ul>
|
||||
* <li>{@code covered}——命中守卫名单(含开关后面那 15 条:受不受开关控制不改变"它在名单里");</li>
|
||||
* <li>{@code public}——设计上匿名可达,列在 {@link #PUBLIC_BY_DESIGN};</li>
|
||||
* <li>{@code pending}——数据按 user_id 归属却还没有认证要求的用户态前缀,是**待收欠账**不是许可,
|
||||
* 列在这里只为让启动日志安静,每条都写明卡在什么上面;</li>
|
||||
* <li>{@code uncovered}——以上都不是 ⇒ 打 {@value #ALERT_ANCHOR} 一行 WARN,
|
||||
* 主机A/B 的巡检(scripts/_prod_watch.py 的 SIGNATURES)把它计入告警。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>自检只读不拦:不参与任何请求的放行判定,所以开它没有可用性风险。
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class ApiGuardCoverageAuditor {
|
||||
|
||||
/** 巡检锚点:_prod_watch.py 按这个字面量 grep,改名要同时改那条签名。 */
|
||||
public static final String ALERT_ANCHOR = "API_GUARD_UNCOVERED";
|
||||
|
||||
/** 设计上匿名可达的基路径。 */
|
||||
static final Set<String> PUBLIC_BY_DESIGN = Set.of(
|
||||
"/login", // 登录本身就是发凭据的入口
|
||||
"/check_login", // 只回答"这个会话还有效吗",无效时不泄漏数据
|
||||
"/logout",
|
||||
"/api/version", // 客户端启动时拉最新版本号,必须先于登录
|
||||
"/api/tutorial", // 后台可维护的使用教程,公开内容
|
||||
"/api/kd-flow/verify", // 开店流程访问密码校验:它自己就是那道门
|
||||
"/error");
|
||||
|
||||
/**
|
||||
* 待收欠账:数据按 user_id 归属、却既不进守卫名单也没有 require* 的前缀。
|
||||
* 划掉它们的条件是"进 USER_TOOL_PREFIXES、并在 user-tool-guard-enabled 打开后回归 covered",
|
||||
* 不是"在这里加一行让它闭嘴"。每条的收敛前提写在下面,被测试逐条核对(新增而不写理由会红):
|
||||
* <ul>
|
||||
* <li>{@code /api/convert} —— 与 collect-data 同形状的桌面端任务,等带 X-Internal-Token 的客户端铺开</li>
|
||||
* <li>{@code /api/convert/templates} —— 同一套桌面端模板读写,随 /api/convert 一起进名单</li>
|
||||
* <li>{@code /api/dedupe} —— 去重库按 user_id 分库,桌面端执行器不带凭据,随客户端铺开收</li>
|
||||
* <li>{@code /api/delete-brand} —— 删品牌任务单,与已在名单里的 /api/brand 同形状,等同一批客户端</li>
|
||||
* <li>{@code /api/module-templates} —— 模板列表按 user_id 取,匿名可读他人模板</li>
|
||||
* <li>{@code /api/split} —— 拆合单任务,随 /api/convert 那批一起收</li>
|
||||
* </ul>
|
||||
*/
|
||||
static final Set<String> PENDING_CONVERGENCE = Set.of(
|
||||
"/api/convert",
|
||||
"/api/convert/templates",
|
||||
"/api/dedupe",
|
||||
"/api/delete-brand",
|
||||
"/api/module-templates",
|
||||
"/api/split");
|
||||
|
||||
private final RequestMappingHandlerMapping handlerMapping;
|
||||
|
||||
@EventListener(ApplicationReadyEvent.class)
|
||||
public void auditOnBoot() {
|
||||
Report report = audit(mappedPaths());
|
||||
if (report.uncovered().isEmpty()) {
|
||||
log.info("[api-guard-coverage] mapped={} covered={} public={} pending={} uncovered=0",
|
||||
report.mapped(), report.covered(), report.publicPaths().size(), report.pending().size());
|
||||
return;
|
||||
}
|
||||
log.warn("[api-guard-coverage] {} count={} endpoints={} —— 这些端点不在守卫前缀里、也不在公开/待收清单里,"
|
||||
+ "匿名可达;请加进 AdminApiGuardFilter 的名单,或确认公开并登记进 PUBLIC_BY_DESIGN",
|
||||
ALERT_ANCHOR, report.uncovered().size(), report.uncovered());
|
||||
}
|
||||
|
||||
/** 纯函数:不依赖 Spring 上下文,也不产生副作用,供单测直接喂路径集合。 */
|
||||
static Report audit(Collection<String> paths) {
|
||||
List<String> uncovered = new ArrayList<>();
|
||||
Set<String> publicPaths = new LinkedHashSet<>();
|
||||
Set<String> pending = new LinkedHashSet<>();
|
||||
int covered = 0;
|
||||
for (String path : paths) {
|
||||
if (matchesAny(path, AdminApiGuardFilter.guardedPrefixes())) {
|
||||
covered++;
|
||||
} else if (matchesAny(path, PUBLIC_BY_DESIGN)) {
|
||||
publicPaths.add(path);
|
||||
} else if (matchesAny(path, PENDING_CONVERGENCE)) {
|
||||
pending.add(path);
|
||||
} else {
|
||||
uncovered.add(path);
|
||||
}
|
||||
}
|
||||
return new Report(paths.size(), covered, List.copyOf(publicPaths), List.copyOf(pending),
|
||||
List.copyOf(new LinkedHashSet<>(uncovered)));
|
||||
}
|
||||
|
||||
private static boolean matchesAny(String path, Collection<String> prefixes) {
|
||||
for (String prefix : prefixes) {
|
||||
if (AdminApiGuardFilter.matchesPrefix(path, prefix)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private Set<String> mappedPaths() {
|
||||
Set<String> paths = new LinkedHashSet<>();
|
||||
for (RequestMappingInfo info : handlerMapping.getHandlerMethods().keySet()) {
|
||||
paths.addAll(info.getPatternValues());
|
||||
}
|
||||
return paths;
|
||||
}
|
||||
|
||||
record Report(int mapped, int covered, List<String> publicPaths, List<String> pending, List<String> uncovered) {
|
||||
}
|
||||
}
|
||||
+4
-38
@@ -2,13 +2,15 @@ package com.nanri.aiimage.modules.asincache.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nanri.aiimage.modules.asincache.model.entity.AsinResultCacheEntity;
|
||||
import org.apache.ibatis.annotations.Insert;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* SQL 在 resources/mapper/asincache/AsinResultCacheMapper.xml:动态标签与列级继承
|
||||
* 写在 Java 文本块里不可维护,复杂 SQL 一律走 XML(见 SqlLayeringConventionTest)。
|
||||
*/
|
||||
@Mapper
|
||||
public interface AsinResultCacheMapper extends BaseMapper<AsinResultCacheEntity> {
|
||||
|
||||
@@ -19,17 +21,6 @@ public interface AsinResultCacheMapper extends BaseMapper<AsinResultCacheEntity>
|
||||
* 「country = ? AND asin IN (...)」这种等值 + IN 的形状;把 country 放进 IN 里
|
||||
* 成对匹配((country, asin) IN ((..),(..)))在 MySQL 上用不上索引。
|
||||
*/
|
||||
@Select("""
|
||||
<script>
|
||||
SELECT id, country, asin, availability, price, brand, delivery_method, seller_name,
|
||||
seller_id, declared_members_json, source_chain, source_task_id,
|
||||
observed_at, created_at, updated_at
|
||||
FROM biz_asin_result_cache
|
||||
WHERE country = #{country}
|
||||
AND asin IN
|
||||
<foreach collection="asins" item="asin" open="(" separator="," close=")">#{asin}</foreach>
|
||||
</script>
|
||||
""")
|
||||
List<AsinResultCacheEntity> selectByCountryAndAsins(@Param("country") String country,
|
||||
@Param("asins") List<String> asins);
|
||||
|
||||
@@ -44,30 +35,5 @@ public interface AsinResultCacheMapper extends BaseMapper<AsinResultCacheEntity>
|
||||
* <p>price / availability / source_* / observed_at 不参与继承:它们是本行结论的主体,
|
||||
* 404 就该把价格清空,"谁最后开的页"也必须如实反映最后一次开页。
|
||||
*/
|
||||
@Insert("""
|
||||
<script>
|
||||
INSERT INTO biz_asin_result_cache
|
||||
(country, asin, availability, price, brand, delivery_method, seller_name, seller_id,
|
||||
declared_members_json, source_chain, source_task_id, observed_at, created_at, updated_at)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.country}, #{row.asin}, #{row.availability}, #{row.price}, #{row.brand},
|
||||
#{row.deliveryMethod}, #{row.sellerName}, #{row.sellerId}, #{row.declaredMembersJson},
|
||||
#{row.sourceChain}, #{row.sourceTaskId}, #{row.observedAt}, #{row.createdAt}, #{row.updatedAt})
|
||||
</foreach>
|
||||
ON DUPLICATE KEY UPDATE
|
||||
availability = VALUES(availability),
|
||||
price = VALUES(price),
|
||||
brand = COALESCE(VALUES(brand), brand),
|
||||
delivery_method = COALESCE(VALUES(delivery_method), delivery_method),
|
||||
seller_name = COALESCE(VALUES(seller_name), seller_name),
|
||||
seller_id = COALESCE(VALUES(seller_id), seller_id),
|
||||
declared_members_json = COALESCE(VALUES(declared_members_json), declared_members_json),
|
||||
source_chain = VALUES(source_chain),
|
||||
source_task_id = VALUES(source_task_id),
|
||||
observed_at = VALUES(observed_at),
|
||||
updated_at = VALUES(updated_at)
|
||||
</script>
|
||||
""")
|
||||
int upsertBatch(@Param("rows") List<AsinResultCacheEntity> rows);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<!--
|
||||
biz_asin_result_cache 的读写 SQL。列级继承口径(哪些列 COALESCE 保旧值、哪些列直接覆盖)
|
||||
的来龙去脉记在 AsinResultCacheMapper#upsertBatch 的注释里,改动请同步那里。
|
||||
-->
|
||||
<mapper namespace="com.nanri.aiimage.modules.asincache.mapper.AsinResultCacheMapper">
|
||||
|
||||
<select id="selectByCountryAndAsins" resultType="com.nanri.aiimage.modules.asincache.model.entity.AsinResultCacheEntity">
|
||||
SELECT id, country, asin, availability, price, brand, delivery_method, seller_name,
|
||||
seller_id, declared_members_json, source_chain, source_task_id,
|
||||
observed_at, created_at, updated_at
|
||||
FROM biz_asin_result_cache
|
||||
WHERE country = #{country}
|
||||
AND asin IN
|
||||
<foreach collection="asins" item="asin" open="(" separator="," close=")">#{asin}</foreach>
|
||||
</select>
|
||||
|
||||
<insert id="upsertBatch">
|
||||
INSERT INTO biz_asin_result_cache
|
||||
(country, asin, availability, price, brand, delivery_method, seller_name, seller_id,
|
||||
declared_members_json, source_chain, source_task_id, observed_at, created_at, updated_at)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.country}, #{row.asin}, #{row.availability}, #{row.price}, #{row.brand},
|
||||
#{row.deliveryMethod}, #{row.sellerName}, #{row.sellerId}, #{row.declaredMembersJson},
|
||||
#{row.sourceChain}, #{row.sourceTaskId}, #{row.observedAt}, #{row.createdAt}, #{row.updatedAt})
|
||||
</foreach>
|
||||
ON DUPLICATE KEY UPDATE
|
||||
availability = VALUES(availability),
|
||||
price = VALUES(price),
|
||||
brand = COALESCE(VALUES(brand), brand),
|
||||
delivery_method = COALESCE(VALUES(delivery_method), delivery_method),
|
||||
seller_name = COALESCE(VALUES(seller_name), seller_name),
|
||||
seller_id = COALESCE(VALUES(seller_id), seller_id),
|
||||
declared_members_json = COALESCE(VALUES(declared_members_json), declared_members_json),
|
||||
source_chain = VALUES(source_chain),
|
||||
source_task_id = VALUES(source_task_id),
|
||||
observed_at = VALUES(observed_at),
|
||||
updated_at = VALUES(updated_at)
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -0,0 +1,402 @@
|
||||
package com.nanri.aiimage;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.junit.jupiter.api.Assertions.fail;
|
||||
|
||||
/**
|
||||
* SQL 分层约定的守卫。口径(2026-10-08 定):<b>SQL 尽量写进 mapper XML</b>,
|
||||
* wrapper 只留给"简单单表"(无 join、无函数级谓词、无动态标签),注解里不再新增 SQL。
|
||||
*
|
||||
* <p>为什么要钉住而不是写在文档里:这个仓原来 0 个 XML、写 SQL 全在注解里,复杂语句
|
||||
* ({@code <foreach>} + {@code ON DUPLICATE KEY} + 逐列 COALESCE)以 Java 文本块存在,
|
||||
* 改一列要在字符串里数括号,也没有任何工具在写错时拦你。约定只存在于注释的话,
|
||||
* 下一个人加 {@code @Insert} 时它就不存在了。所以这里把"当前有多少"逐个钉死:
|
||||
* <ul>
|
||||
* <li>新增注解 SQL ⇒ {@link #annotationSqlInventoryDoesNotGrow} 红;</li>
|
||||
* <li>新增 wrapper 里夹带的函数级 SQL ⇒ {@link #rawSqlInsideWrappersDoesNotGrow} 红,
|
||||
* 那正是"简单单表"的边界,越界就该进 XML;</li>
|
||||
* <li>迁走一条 ⇒ 必须同时改基线常量,减法出现在 diff 上。</li>
|
||||
* </ul>
|
||||
*
|
||||
* <p>反向失明也一并堵:XML 里的坏 SQL 没有编译期反馈,所以
|
||||
* {@link #everyXmlStatementMatchesAnInterfaceMethod} 要求 XML 语句名逐字对上接口方法名——
|
||||
* 对不上的表现是"启动正常、调用才报 no statement",那是线上才会撞到的面。
|
||||
*/
|
||||
class SqlLayeringConventionTest {
|
||||
|
||||
/** 写 SQL(@Insert/@Update/@Delete)在注解里的现状清单:文件名 → 条数。只许减,不许加。 */
|
||||
private static final Map<String, Integer> WRITE_SQL_BASELINE = writeSqlBaseline();
|
||||
|
||||
/**
|
||||
* 读侧注解 SQL 的总量与文件数(2026-10-08 实测 65 条 / 16 个接口)。
|
||||
* 读侧按"尽量 XML"是主要待迁面,最重的是 TaskCenterQueryMapper;
|
||||
* 钉总数而不是逐条清单,是因为逐条会把这份守卫变成迁移进度表——它该只做"别再加"的闸门。
|
||||
*/
|
||||
private static final int SELECT_ANNOTATION_TOTAL = 65;
|
||||
private static final int SELECT_ANNOTATION_FILES = 16;
|
||||
|
||||
/**
|
||||
* wrapper 里夹带函数级 SQL 的现状("这不是简单单表"的证据),文件名 → 条数:
|
||||
* apply/inSql 是真谓词,last("FOR UPDATE") 是行锁。
|
||||
*/
|
||||
private static final Map<String, Integer> RAW_SQL_IN_WRAPPERS_BASELINE = rawSqlInWrappersBaseline();
|
||||
|
||||
/**
|
||||
* 其中"复杂"的写 SQL(注解正文含动态标签)——Wrapper 表达不了(批量/INSERT…SELECT/upsert),
|
||||
* 按约定应迁到 XML。这是待迁 backlog,不是许可名单:迁走一条要同时从这里划掉。
|
||||
*/
|
||||
private static final List<String> COMPLEX_WRITE_SQL_BACKLOG = List.of(
|
||||
"CollectDataItemMapper", "DedupeTotalDataMapper", "InvalidAsinDataMapper",
|
||||
"UserColumnPermissionMapper", "PublishItemMapper", "ShopDataCrawlItemMapper",
|
||||
"QueryAsinMapper", "TaskResultItemMapper");
|
||||
|
||||
/** 唯一没有实体可走的 mapper:连 wrapper 的入口都没有,所以只能写裸 SQL。 */
|
||||
private static final List<String> MAPPERS_WITHOUT_ENTITY = List.of("UserColumnPermissionMapper");
|
||||
|
||||
/** 已经迁到 XML 的:反向钉住"不许再用注解把 SQL 写回来"(注解 + XML 同名会让启动期抛重复语句)。 */
|
||||
private static final List<String> MIGRATED_TO_XML = List.of("AsinResultCacheMapper");
|
||||
|
||||
private static final Pattern WRITE_ANNOTATION = Pattern.compile("@(Insert|Update|Delete)\\(");
|
||||
private static final Pattern SELECT_ANNOTATION = Pattern.compile("@Select\\(");
|
||||
private static final Pattern WRITE_ANNOTATION_BODY =
|
||||
Pattern.compile("@(Insert|Update|Delete)\\(\\s*\"\"\"(.*?)\"\"\"", Pattern.DOTALL);
|
||||
|
||||
private static Map<String, Integer> writeSqlBaseline() {
|
||||
Map<String, Integer> baseline = new LinkedHashMap<>();
|
||||
baseline.put("CollectDataItemMapper", 1);
|
||||
baseline.put("DedupeTotalDataMapper", 1);
|
||||
baseline.put("DeviceLogFileMapper", 1);
|
||||
baseline.put("ImageVideoAsyncTaskMapper", 3);
|
||||
baseline.put("InvalidAsinDataMapper", 1);
|
||||
baseline.put("UserNotificationMapper", 2);
|
||||
baseline.put("UserColumnPermissionMapper", 4);
|
||||
baseline.put("PriceTrackLoopRunMapper", 1);
|
||||
baseline.put("PublishItemMapper", 1);
|
||||
baseline.put("ShopDataCrawlItemMapper", 4);
|
||||
baseline.put("ShopDataDuplicateScanMapper", 1);
|
||||
baseline.put("QueryAsinMapper", 1);
|
||||
baseline.put("SoftwareVersionMapper", 1);
|
||||
baseline.put("TaskImageCacheMapper", 4);
|
||||
baseline.put("TaskResultItemMapper", 1);
|
||||
baseline.put("UserSecretUsageMapper", 2);
|
||||
return baseline;
|
||||
}
|
||||
|
||||
private static Map<String, Integer> rawSqlInWrappersBaseline() {
|
||||
Map<String, Integer> baseline = new LinkedHashMap<>();
|
||||
baseline.put("PublishTaskService", 6); // ownerInstanceId 的 JSON_EXTRACT 谓词
|
||||
baseline.put("SimilarAsinTaskOwnershipSupport", 3); // 同上,state_json 维度
|
||||
baseline.put("ShopDataCrawlDailyFileService", 4); // last("FOR UPDATE") 行锁
|
||||
baseline.put("TaskScopePayloadStorageService", 1); // last("limit 1 FOR UPDATE") 混写
|
||||
baseline.put("SimilarAsinTaskProgressSupport", 1); // inSql 子查询
|
||||
return baseline;
|
||||
}
|
||||
|
||||
@Test
|
||||
void annotationSqlInventoryDoesNotGrow() throws IOException {
|
||||
Map<String, Integer> actual = new LinkedHashMap<>();
|
||||
int selects = 0;
|
||||
List<String> selectFiles = new ArrayList<>();
|
||||
for (Path file : mappers()) {
|
||||
String text = stripComments(read(file));
|
||||
int writes = count(WRITE_ANNOTATION, text);
|
||||
if (writes > 0) {
|
||||
actual.put(stem(file), writes);
|
||||
}
|
||||
int read = count(SELECT_ANNOTATION, text);
|
||||
if (read > 0) {
|
||||
selects += read;
|
||||
selectFiles.add(stem(file));
|
||||
}
|
||||
}
|
||||
assertEquals(WRITE_SQL_BASELINE, actual, () -> "注解里的写 SQL 清单变了。" + System.lineSeparator()
|
||||
+ " 新增 → 写进 src/main/resources/mapper/<模块>/<Name>Mapper.xml;"
|
||||
+ "简单单表才用 BaseMapper/实体(wrapper)。" + System.lineSeparator()
|
||||
+ " 迁走 → 把这一项从 WRITE_SQL_BASELINE 里减掉,让减法出现在 diff 上。");
|
||||
assertFalse(actual.isEmpty(), "清单为空说明本用例没扫到任何 mapper,判据本身坏了");
|
||||
assertEquals(SELECT_ANNOTATION_TOTAL, selects,
|
||||
() -> "注解里的 @Select 总数变了(读侧同样按 XML 优先)。迁一条就减一:" + selectFiles);
|
||||
assertEquals(SELECT_ANNOTATION_FILES, selectFiles.size(),
|
||||
"带注解 @Select 的接口个数变了:" + selectFiles);
|
||||
}
|
||||
|
||||
/**
|
||||
* wrapper 只该出现在"简单单表"上。函数级谓词(JSON_EXTRACT)、行锁(FOR UPDATE)、
|
||||
* 子查询(inSql)都说明这条查询已经越过那条线——按口径应进 XML。
|
||||
*
|
||||
* <p>{@code last("LIMIT n")} 故意不算越界:MP 的分页 idiomatic 写法就是它,
|
||||
* 全仓 205 处,把它算成违规只会让守卫第一天就没人管。豁免面由
|
||||
* {@link #limitExemptionDoesNotHideRealSql} 反向钉住。
|
||||
*/
|
||||
@Test
|
||||
void rawSqlInsideWrappersDoesNotGrow() throws IOException {
|
||||
Map<String, Integer> actual = new LinkedHashMap<>();
|
||||
for (Path file : mainSources()) {
|
||||
int hits = countRawSqlInWrapper(stripComments(read(file)));
|
||||
if (hits > 0) {
|
||||
actual.put(stem(file), hits);
|
||||
}
|
||||
}
|
||||
assertEquals(RAW_SQL_IN_WRAPPERS_BASELINE, actual, () -> "wrapper 里夹带的函数级 SQL 变了。"
|
||||
+ System.lineSeparator()
|
||||
+ " 新增 → 这条已经不是简单单表,SQL 写进 mapper XML;" + System.lineSeparator()
|
||||
+ " 迁走 → 同步减 RAW_SQL_IN_WRAPPERS_BASELINE。当前实测:" + actual);
|
||||
assertTrue(actual.values().stream().mapToInt(Integer::intValue).sum() >= 10,
|
||||
"只数到 " + actual + " 条,多半是正则或目录坏了——恒 0 的闸门比没有闸门更糟");
|
||||
}
|
||||
|
||||
@Test
|
||||
void limitExemptionDoesNotHideRealSql() {
|
||||
// 计数器必须"看见" JSON_EXTRACT / FOR UPDATE / inSql,但放过 LIMIT —— 四种形状各喂一条
|
||||
assertEquals(1, countRawSqlInWrapper("q.apply(\"JSON_UNQUOTE(JSON_EXTRACT(a, '$.b')) = {0}\", v));"));
|
||||
assertEquals(1, countRawSqlInWrapper("q.last(\"FOR UPDATE\"));"));
|
||||
assertEquals(1, countRawSqlInWrapper("q.inSql(FileTaskEntity::getId, \"select id from t\"));"));
|
||||
assertEquals(0, countRawSqlInWrapper("q.last(\"LIMIT \" + safeLimit));"),
|
||||
"LIMIT 分页 idiomatic 写法不该计入,否则 205 处噪音会把这条守卫淹掉");
|
||||
// 但 "LIMIT 1 FOR UPDATE" 这种混写必须计入——不能被前缀是 LIMIT 就放过
|
||||
assertEquals(1, countRawSqlInWrapper("q.last(\"limit 1 FOR UPDATE\"));"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void noNewComplexWriteSqlInAnnotations() throws IOException {
|
||||
List<String> complex = new ArrayList<>();
|
||||
for (Path file : mappers()) {
|
||||
Matcher matcher = WRITE_ANNOTATION_BODY.matcher(stripComments(read(file)));
|
||||
while (matcher.find()) {
|
||||
String body = matcher.group(2);
|
||||
if (body.contains("<script>") || body.contains("<if ")
|
||||
|| body.contains("<foreach") || body.contains("<set>")) {
|
||||
complex.add(stem(file));
|
||||
}
|
||||
}
|
||||
}
|
||||
List<String> unexpected = complex.stream().distinct()
|
||||
.filter(name -> !COMPLEX_WRITE_SQL_BACKLOG.contains(name))
|
||||
.collect(Collectors.toList());
|
||||
assertTrue(unexpected.isEmpty(), () -> "这些 mapper 新写了带动态标签的 SQL 注解:" + unexpected
|
||||
+ " —— 按约定放进 src/main/resources/mapper/<模块>/<Name>Mapper.xml");
|
||||
assertEquals(COMPLEX_WRITE_SQL_BACKLOG.stream().sorted().collect(Collectors.toList()),
|
||||
complex.stream().distinct().sorted().collect(Collectors.toList()),
|
||||
"复杂写 SQL 的待迁清单变了:迁走一条就同时从 COMPLEX_WRITE_SQL_BACKLOG 划掉");
|
||||
}
|
||||
|
||||
@Test
|
||||
void everyMigratedMapperHasNoAnnotatedSqlLeft() {
|
||||
for (String name : MIGRATED_TO_XML) {
|
||||
Path file = findMapperInterface(name);
|
||||
String text = stripComments(read(file));
|
||||
assertFalse(count(WRITE_ANNOTATION, text) > 0,
|
||||
() -> name + " 已迁到 XML,注解里却又出现写 SQL:同名会让 MyBatis 启动期抛重复语句");
|
||||
assertFalse(count(SELECT_ANNOTATION, text) > 0,
|
||||
() -> name + " 已迁到 XML,注解里却又出现 @Select:" + name);
|
||||
assertFalse(text.contains("<script>"),
|
||||
() -> name + " 的注解里还留着 <script>:迁移只做了一半,调用时会报 no statement");
|
||||
assertTrue(xmlFiles().stream().anyMatch(x -> stem(x).equals(name)),
|
||||
() -> name + " 声称已迁 XML,但 src/main/resources/mapper 下没有同名文件");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void everyXmlStatementMatchesAnInterfaceMethod() throws IOException {
|
||||
List<Path> xmls = xmlFiles();
|
||||
assertFalse(xmls.isEmpty(), "mapper XML 目录是空的——迁移通道没落地,本用例就成了恒绿");
|
||||
for (Path xml : xmls) {
|
||||
String text = read(xml);
|
||||
String namespace = firstGroup(Pattern.compile("namespace=\"([^\"]+)\""), text,
|
||||
xml + " 缺 namespace(MyBatis 无法把语句绑到接口)");
|
||||
Path iface = findMapperInterfaceByFqn(namespace);
|
||||
List<String> statementIds = allGroups(Pattern.compile(
|
||||
"<(select|insert|update|delete)\\s+id=\"([^\"]+)\""), text, 2);
|
||||
assertFalse(statementIds.isEmpty(), () -> xml + " 里没有任何语句");
|
||||
for (String id : statementIds) {
|
||||
assertTrue(declaredMethods(iface).contains(id),
|
||||
() -> id + "(" + xml.getFileName() + ")在 " + namespace
|
||||
+ " 上没有同名方法:启动不报错,调用时才报 no statement");
|
||||
}
|
||||
assertEquals(stem(iface), stem(xml), "XML 文件名应与接口名一致,便于按名找 SQL");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void newMappersMustBeEntityBacked() throws IOException {
|
||||
List<String> offenders = new ArrayList<>();
|
||||
for (Path file : mappers()) {
|
||||
String text = stripComments(read(file));
|
||||
if (count(WRITE_ANNOTATION, text) > 0 && !text.contains("BaseMapper<")) {
|
||||
offenders.add(stem(file));
|
||||
}
|
||||
}
|
||||
assertEquals(MAPPERS_WITHOUT_ENTITY, offenders.stream().distinct().sorted().collect(Collectors.toList()),
|
||||
() -> "带写 SQL 又不继承 BaseMapper<T> 的 mapper 变了:没有实体就没有 wrapper 入口,"
|
||||
+ "新 mapper 请 extends BaseMapper<XxxEntity>");
|
||||
}
|
||||
|
||||
@Test
|
||||
void xmlDirectoryIsActuallyOnTheLoadPath() throws IOException {
|
||||
Path resources = moduleRoot().resolve("src/main/resources/mapper");
|
||||
assertTrue(Files.isDirectory(resources), "src/main/resources/mapper 不存在,迁移无处可放");
|
||||
String yml = read(moduleRoot().resolve("src/main/resources/application.yml"));
|
||||
assertTrue(yml.replaceAll("\\s+", " ").contains("mapper-locations: classpath*:mapper/**/*.xml"),
|
||||
"application.yml 的 mapper-locations 变了:XML 会被静默忽略,调用时才报 no statement");
|
||||
}
|
||||
|
||||
// ---------- 判据本体(纯函数,喂字符串即可验,不依赖目录里恰好有什么) ----------
|
||||
|
||||
/** 数一段源码里"wrapper 夹带函数级 SQL"的次数;last("LIMIT …") 是允许的写法。 */
|
||||
static int countRawSqlInWrapper(String text) {
|
||||
int hits = 0;
|
||||
Matcher m = Pattern.compile("\\.(apply|inSql|having|last)\\(\\s*(\"[^\"]*\"|[^,)\\n]+,\\s*\")")
|
||||
.matcher(text);
|
||||
while (m.find()) {
|
||||
String tail = text.substring(m.start(), Math.min(text.length(), m.end() + 120));
|
||||
String upper = tail.toUpperCase();
|
||||
boolean realSql = upper.contains("JSON_") || upper.contains("FOR UPDATE")
|
||||
|| upper.contains("SELECT ") || upper.contains("WHERE ")
|
||||
|| m.group(1).equals("inSql") || m.group(1).equals("having");
|
||||
if (realSql) {
|
||||
hits++;
|
||||
}
|
||||
}
|
||||
return hits;
|
||||
}
|
||||
|
||||
// ---------- 取样 ----------
|
||||
|
||||
private static List<Path> mappers() throws IOException {
|
||||
return mainSources().stream()
|
||||
.filter(p -> p.getFileName().toString().endsWith("Mapper.java"))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
private static List<Path> mainSources() throws IOException {
|
||||
Path root = moduleRoot().resolve("src/main/java");
|
||||
if (!Files.isDirectory(root)) {
|
||||
fail("找不到 " + root + " —— 用例依赖以 backend-java 为工作目录运行,别让守卫静默通过");
|
||||
}
|
||||
try (Stream<Path> walk = Files.walk(root)) {
|
||||
return walk.filter(Files::isRegularFile)
|
||||
.filter(p -> p.getFileName().toString().endsWith(".java"))
|
||||
.sorted()
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
private static List<Path> xmlFiles() {
|
||||
try (Stream<Path> walk = Files.walk(moduleRoot().resolve("src/main/resources/mapper"))) {
|
||||
return walk.filter(Files::isRegularFile)
|
||||
.filter(p -> p.getFileName().toString().endsWith(".xml"))
|
||||
.sorted()
|
||||
.collect(Collectors.toList());
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("遍历 mapper XML 失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
private static Path findMapperInterface(String simpleName) {
|
||||
try {
|
||||
return mappers().stream()
|
||||
.filter(p -> stem(p).equals(simpleName))
|
||||
.findFirst()
|
||||
.orElseThrow(() -> new IllegalStateException("找不到 mapper 接口 " + simpleName));
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException(e);
|
||||
}
|
||||
}
|
||||
|
||||
private static Path findMapperInterfaceByFqn(String fqn) {
|
||||
String simpleName = fqn.substring(fqn.lastIndexOf('.') + 1);
|
||||
Path file = findMapperInterface(simpleName);
|
||||
assertTrue(read(file).contains("package " + fqn.substring(0, fqn.lastIndexOf('.')) + ";"),
|
||||
() -> "XML namespace 指向 " + fqn + ",但 " + file + " 不在那个包里");
|
||||
return file;
|
||||
}
|
||||
|
||||
private static List<String> declaredMethods(Path iface) {
|
||||
// 只要声明行:形如 "Xxx yyy(" 的方法签名,跳过注解与注释
|
||||
List<String> names = new ArrayList<>();
|
||||
for (String raw : stripComments(read(iface)).split("\n", -1)) {
|
||||
String line = raw.trim();
|
||||
if (line.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
Matcher m = Pattern.compile("^[\\w<>?,.\\[\\]\\s]+?\\s(\\w+)\\s*\\(").matcher(line);
|
||||
if (m.find()) {
|
||||
names.add(m.group(1));
|
||||
}
|
||||
}
|
||||
return names;
|
||||
}
|
||||
|
||||
private static String firstGroup(Pattern pattern, String text, String message) {
|
||||
Matcher m = pattern.matcher(text);
|
||||
if (!m.find()) {
|
||||
throw new IllegalStateException(message);
|
||||
}
|
||||
return m.group(1);
|
||||
}
|
||||
|
||||
private static List<String> allGroups(Pattern pattern, String text, int group) {
|
||||
List<String> out = new ArrayList<>();
|
||||
Matcher m = pattern.matcher(text);
|
||||
while (m.find()) {
|
||||
out.add(m.group(group));
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
private static int count(Pattern pattern, String text) {
|
||||
int hits = 0;
|
||||
Matcher m = pattern.matcher(text);
|
||||
while (m.find()) {
|
||||
hits++;
|
||||
}
|
||||
return hits;
|
||||
}
|
||||
|
||||
private static String stripComments(String text) {
|
||||
return text.replaceAll("/\\*[\\s\\S]*?\\*/", "").replaceAll("//[^\\n]*", "");
|
||||
}
|
||||
|
||||
private static String stem(Path path) {
|
||||
String name = path.getFileName().toString();
|
||||
return name.substring(0, name.length() - (name.endsWith(".java") ? 5 : 4));
|
||||
}
|
||||
|
||||
private static String read(Path path) {
|
||||
try {
|
||||
return Files.readString(path, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + path, e);
|
||||
}
|
||||
}
|
||||
|
||||
/** surefire 的工作目录是模块目录;从仓库根或 IDE 跑时退到 backend-java/。 */
|
||||
private static Path moduleRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
if (Files.isDirectory(here.resolve("src/main/java"))) {
|
||||
return here;
|
||||
}
|
||||
Path nested = here.resolve("backend-java");
|
||||
if (Files.isDirectory(nested.resolve("src/main/java"))) {
|
||||
return nested;
|
||||
}
|
||||
throw new IllegalStateException("无法定位 backend-java 模块目录(cwd=" + here + ")");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,177 @@
|
||||
package com.nanri.aiimage.config;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* {@link ApiGuardCoverageAuditor} 的守卫守卫。
|
||||
*
|
||||
* <p>自检本身有两个会静默失效的地方,这里逐个钉住:
|
||||
* <ol>
|
||||
* <li>清单腐烂——PUBLIC_BY_DESIGN / PENDING_CONVERGENCE 里的前缀对应的控制器早就没了,
|
||||
* 条目却还"掩护"着以后随便挂上来的同名前缀端点;</li>
|
||||
* <li>名单抄歪——守卫实际用的前缀数组(USER_TOOL_PREFIXES 等)与自检看到的必须是同一份,
|
||||
* 少一条就会把"其实被看守"的端点报成欠账,多一条就会把没人看守的报成 covered。</li>
|
||||
* </ol>
|
||||
*/
|
||||
class ApiGuardCoverageAuditorTest {
|
||||
|
||||
@Test
|
||||
void classifiesEachOfTheFourBuckets() {
|
||||
ApiGuardCoverageAuditor.Report report = ApiGuardCoverageAuditor.audit(List.of(
|
||||
"/api/admin/users", // 名单内,无条件
|
||||
"/api/notifications/summary", // 自助前缀,无条件
|
||||
"/api/collect-data/pull", // 用户态前缀(在开关后面,但仍算"在名单里")
|
||||
"/login", // 设计公开
|
||||
"/api/dedupe/runs", // 待收欠账
|
||||
"/api/brand-check-tasks/1")); // 谁都不沾
|
||||
|
||||
assertEquals(3, report.covered(), "守卫名单内应有 3 条:admin / 自助 / 用户态");
|
||||
assertEquals(List.of("/login"), report.publicPaths());
|
||||
assertEquals(List.of("/api/dedupe/runs"), report.pending());
|
||||
assertEquals(List.of("/api/brand-check-tasks/1"), report.uncovered(),
|
||||
"新端点必须落进 uncovered,否则这条护栏就是装饰");
|
||||
}
|
||||
|
||||
@Test
|
||||
void alertAnchorIsEmittedOnlyWhenSomethingIsUncovered() {
|
||||
assertTrue(ApiGuardCoverageAuditor.audit(List.of("/api/admin/x")).uncovered().isEmpty(),
|
||||
"全 covered 时不该报警");
|
||||
List<String> uncovered = ApiGuardCoverageAuditor.audit(List.of("/api/yolo")).uncovered();
|
||||
assertEquals(1, uncovered.size());
|
||||
assertFalse(ApiGuardCoverageAuditor.ALERT_ANCHOR.isBlank(), "锚点为空的话巡检 grep 到的是空气");
|
||||
}
|
||||
|
||||
@Test
|
||||
void guardedPrefixesCarriesEveryGuardedList() {
|
||||
List<String> guarded = AdminApiGuardFilter.guardedPrefixes();
|
||||
assertTrue(guarded.contains("/api/admin"), "admin 前缀没进自检可见名单");
|
||||
assertTrue(guarded.contains("/debug"), "debug 前缀没进自检可见名单");
|
||||
// 这两组条数是实测基线(2026-10-08:用户态 15 条、自助 6 条)。
|
||||
// 只钉"contains 某条"的话,从数组里删掉一整段都可能不红,所以钉总数。
|
||||
assertEquals(22, count(guarded, "/api/"), () -> "以 /api/ 开头的守卫前缀数变了(基线 22 = admin 1 + 用户态 15 + 自助 6):" + guarded);
|
||||
assertEquals(23, guarded.size(), "守卫前缀总数变了(22 条 /api/ + /debug):" + guarded);
|
||||
assertTrue(guarded.contains("/api/publish"), "2026-10-07 补的上架前缀不能退回名单外");
|
||||
assertTrue(guarded.contains("/api/tasks"), "心跳/打断前缀不能退回名单外");
|
||||
assertTrue(guarded.contains("/api/internal"), "内部端点前缀不能退回名单外");
|
||||
}
|
||||
|
||||
@Test
|
||||
void everyDeclaredPublicOrPendingPrefixIsStillLive() throws IOException {
|
||||
Set<String> controllerBases = controllerBasePaths();
|
||||
List<String> dead = new ArrayList<>();
|
||||
for (String prefix : ApiGuardCoverageAuditor.PUBLIC_BY_DESIGN) {
|
||||
if (prefix.equals("/error")) {
|
||||
continue; // Spring 自带的错误页,不是控制器映射
|
||||
}
|
||||
if (controllerBases.stream().noneMatch(base -> base.equals(prefix) || base.startsWith(prefix + "/"))) {
|
||||
dead.add(prefix);
|
||||
}
|
||||
}
|
||||
for (String prefix : ApiGuardCoverageAuditor.PENDING_CONVERGENCE) {
|
||||
if (controllerBases.stream().noneMatch(base -> base.equals(prefix) || base.startsWith(prefix + "/"))) {
|
||||
dead.add(prefix);
|
||||
}
|
||||
}
|
||||
assertTrue(dead.isEmpty(), () -> "这些清单条目已经对不上任何控制器映射,条目还在就会掩护同名新端点:" + dead);
|
||||
}
|
||||
|
||||
@Test
|
||||
void pendingListDoesNotOverlapTheGuardedList() {
|
||||
List<String> overlap = ApiGuardCoverageAuditor.PENDING_CONVERGENCE.stream()
|
||||
.filter(prefix -> ApiGuardCoverageAuditor.audit(List.of(prefix)).covered() > 0)
|
||||
.collect(Collectors.toList());
|
||||
assertTrue(overlap.isEmpty(), () -> "欠账清单与守卫名单重叠,说明这一条早已收敛却还挂在欠账里:" + overlap);
|
||||
}
|
||||
|
||||
@Test
|
||||
void publicListDoesNotOverlapTheGuardedList() {
|
||||
List<String> overlap = ApiGuardCoverageAuditor.PUBLIC_BY_DESIGN.stream()
|
||||
.filter(prefix -> ApiGuardCoverageAuditor.audit(List.of(prefix)).covered() > 0)
|
||||
.collect(Collectors.toList());
|
||||
assertTrue(overlap.isEmpty(), () -> "这些前缀已被守卫看守,登记成『设计公开』会让欠账看起来已收口:" + overlap);
|
||||
}
|
||||
|
||||
/** 从控制器源码取映射基路径:类级 @RequestMapping 优先,没有类级的才看方法级绝对路径。 */
|
||||
private static Set<String> controllerBasePaths() throws IOException {
|
||||
Set<String> out = new java.util.LinkedHashSet<>();
|
||||
for (Path file : controllers()) {
|
||||
String text = stripComments(read(file));
|
||||
List<String> bases = new ArrayList<>();
|
||||
Matcher klass = Pattern.compile("@RequestMapping\\(\\s*(?:value\\s*=\\s*)?\"([^\"]+)\"").matcher(text);
|
||||
while (klass.find()) {
|
||||
bases.add(klass.group(1));
|
||||
}
|
||||
if (bases.isEmpty()) {
|
||||
Matcher method = Pattern.compile(
|
||||
"@(?:Get|Post|Put|Delete|Request)Mapping\\(\\s*(?:value\\s*=\\s*)?\"([/][^\"]+)").matcher(text);
|
||||
while (method.find()) {
|
||||
String absolute = method.group(1);
|
||||
while (absolute.endsWith("/")) {
|
||||
absolute = absolute.substring(0, absolute.length() - 1);
|
||||
}
|
||||
String[] parts = absolute.split("/"); // "/login" -> ["", "login"]
|
||||
for (int depth = 1; depth <= parts.length - 1 && depth <= 3; depth++) {
|
||||
bases.add("/" + String.join("/", java.util.Arrays.copyOfRange(parts, 1, 1 + depth)));
|
||||
}
|
||||
bases.add(absolute);
|
||||
}
|
||||
}
|
||||
out.addAll(bases);
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
private static int count(List<String> values, String startsWith) {
|
||||
return (int) values.stream().filter(v -> v.startsWith(startsWith)).count();
|
||||
}
|
||||
|
||||
private static List<Path> controllers() throws IOException {
|
||||
try (Stream<Path> walk = Files.walk(moduleRoot().resolve("src/main/java"))) {
|
||||
return walk.filter(Files::isRegularFile)
|
||||
.filter(p -> p.getFileName().toString().contains("Controller"))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
|
||||
private static String stripComments(String text) {
|
||||
return text.replaceAll("/\\*\\s*\\n[\\s\\S]*?\\*/", "")
|
||||
.replaceAll("/\\*.*?\\*/", "")
|
||||
.replaceAll("//[^\\n]*", "");
|
||||
}
|
||||
|
||||
private static String read(Path path) {
|
||||
try {
|
||||
return Files.readString(path, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + path, e);
|
||||
}
|
||||
}
|
||||
|
||||
private static Path moduleRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
if (Files.isDirectory(here.resolve("src/main/java"))) {
|
||||
return here;
|
||||
}
|
||||
Path nested = here.resolve("backend-java");
|
||||
if (Files.isDirectory(nested.resolve("src/main/java"))) {
|
||||
return nested;
|
||||
}
|
||||
throw new IllegalStateException("无法定位 backend-java 模块目录(cwd=" + here + ")");
|
||||
}
|
||||
}
|
||||
+165
@@ -0,0 +1,165 @@
|
||||
package com.nanri.aiimage.modules.asincache.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.nanri.aiimage.modules.asincache.model.entity.AsinResultCacheEntity;
|
||||
import org.apache.ibatis.io.Resources;
|
||||
import org.apache.ibatis.builder.xml.XMLMapperBuilder;
|
||||
import org.apache.ibatis.mapping.BoundSql;
|
||||
import org.apache.ibatis.mapping.MappedStatement;
|
||||
import org.apache.ibatis.session.Configuration;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertSame;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* {@code AsinResultCacheMapper} 的 SQL 已从注解搬到 mapper XML,本用例钉住"搬完还是同一条 SQL"。
|
||||
*
|
||||
* <p>为什么必须有:注解与 XML 同名会让 MyBatis 在启动期直接抛异常(本地不起容器就看不见),
|
||||
* 而只搬一半(select 在 XML、upsert 还在注解)表现是"启动正常、调用时报无此语句"。
|
||||
* 这里用真 {@code XMLMapperBuilder} 解析、向真 {@code BoundSql} 断言,
|
||||
* 并把列级继承口径(5 个 COALESCE 列)逐条钉住——XML 里没有注解那种编译期约束,
|
||||
* 少写一个 COALESCE 只会让线上把卖家名抹成空,不会有任何测试自然变红。
|
||||
*/
|
||||
class AsinResultCacheMapperXmlTest {
|
||||
|
||||
private static final String XML = "mapper/asincache/AsinResultCacheMapper.xml";
|
||||
private static final String NS = "com.nanri.aiimage.modules.asincache.mapper.AsinResultCacheMapper";
|
||||
|
||||
/** 参与"新值没带到就保旧值"的列——与实体注释里的继承口径一一对应。 */
|
||||
private static final List<String> INHERITED_COLUMNS = List.of(
|
||||
"brand", "delivery_method", "seller_name", "seller_id", "declared_members_json");
|
||||
|
||||
/** 本行结论的主体,重采必须直接覆盖(404 要能把 price 清空)。 */
|
||||
private static final List<String> OVERWRITTEN_COLUMNS = List.of(
|
||||
"availability", "price", "source_chain", "source_task_id", "observed_at", "updated_at");
|
||||
|
||||
@Test
|
||||
void xmlIsParsableAndBindsEveryInterfaceMethod() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
|
||||
for (String id : List.of("selectByCountryAndAsins", "upsertBatch")) {
|
||||
assertTrue(configuration.hasStatement(NS + "." + id),
|
||||
() -> XML + " 里没有 " + id + "(语句名必须与接口方法名逐字一致)");
|
||||
}
|
||||
// namespace 能绑到接口,说明 mapper-locations 扫得到、包名没写错
|
||||
assertTrue(configuration.hasMapper(AsinResultCacheMapper.class),
|
||||
"namespace 没能绑定到接口——检查 mybatis-plus.mapper-locations 与包路径");
|
||||
}
|
||||
|
||||
@Test
|
||||
void annotationsAreGoneSoTheStatementIsNotDefinedTwice() throws Exception {
|
||||
for (var method : AsinResultCacheMapper.class.getDeclaredMethods()) {
|
||||
assertFalse(method.isAnnotationPresent(org.apache.ibatis.annotations.Select.class),
|
||||
() -> method.getName() + " 还带着 @Select:注解 + XML 同名会让启动期抛重复语句");
|
||||
assertFalse(method.isAnnotationPresent(org.apache.ibatis.annotations.Insert.class),
|
||||
() -> method.getName() + " 还带着 @Insert:注解 + XML 同名会让启动期抛重复语句");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void upsertExpandsOneValueTuplePerRowAndCarriesNoInjection() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
MappedStatement statement = configuration.getMappedStatement(NS + ".upsertBatch");
|
||||
|
||||
BoundSql boundSql = statement.getBoundSql(param(rows(2)));
|
||||
String sql = boundSql.getSql().replaceAll("\\s+", " ");
|
||||
|
||||
assertTrue(sql.startsWith("INSERT INTO biz_asin_result_cache "), "仍是整行 upsert 形态: " + sql);
|
||||
assertTrue(sql.contains("ON DUPLICATE KEY UPDATE"), () -> "upsert 退化成纯 INSERT 会插重复行: " + sql);
|
||||
assertEquals(28, boundSql.getParameterMappings().size(),
|
||||
"14 列 x 2 行的占位符数(列清单被改动过就要重新核对): " + sql);
|
||||
assertFalse(sql.contains("$"), "不得出现 ${} 拼接面");
|
||||
}
|
||||
|
||||
@Test
|
||||
void columnLevelInheritanceSurvivesTheMove() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
String sql = configuration.getMappedStatement(NS + ".upsertBatch")
|
||||
.getBoundSql(param(rows(1))).getSql().replaceAll("\\s+", " ");
|
||||
String updateClause = sql.substring(sql.indexOf("ON DUPLICATE KEY UPDATE"));
|
||||
|
||||
for (String column : INHERITED_COLUMNS) {
|
||||
assertTrue(updateClause.contains("COALESCE(VALUES(" + column + "), " + column + ")"),
|
||||
() -> column + " 丢了列级继承:一条变体记录会把关键词记录里的卖家信息抹成空");
|
||||
}
|
||||
for (String column : OVERWRITTEN_COLUMNS) {
|
||||
assertTrue(updateClause.contains(column + " = VALUES(" + column + ")"),
|
||||
() -> column + " 不再直接覆盖:404 就清不掉旧价格了");
|
||||
assertFalse(updateClause.contains("COALESCE(VALUES(" + column + ")"),
|
||||
() -> column + " 不该参与继承: " + column);
|
||||
}
|
||||
assertEquals(INHERITED_COLUMNS.size(), countOccurrences(updateClause, "COALESCE("),
|
||||
"COALESCE 列数变了——继承清单被悄悄加/减过");
|
||||
}
|
||||
|
||||
@Test
|
||||
void selectStaysOnTheCountryPrefixAndMapsToTheEntity() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
MappedStatement statement = configuration.getMappedStatement(NS + ".selectByCountryAndAsins");
|
||||
|
||||
String sql = statement.getBoundSql(Map.of("country", "DE", "asins", List.of("B01", "B02")))
|
||||
.getSql().replaceAll("\\s+", " ");
|
||||
assertSame(AsinResultCacheEntity.class, statement.getResultMaps().get(0).getType());
|
||||
// country 必须是等值:放进 (country,asin) IN ((..),(..)) 在 MySQL 上用不上 uk_asin_cache_country_asin
|
||||
assertTrue(sql.contains("WHERE country = ? AND asin IN"),
|
||||
() -> "国家维度的等值形状变了,唯一键前缀会失配: " + sql);
|
||||
assertEquals(3, sql.chars().filter(c -> c == '?').count(), "1 个 country + 2 个 asin");
|
||||
}
|
||||
|
||||
@Test
|
||||
void mapperLocationsStillPointsAtTheXmlDirectory() throws Exception {
|
||||
String yml;
|
||||
try (InputStream in = Resources.getResourceAsStream("application.yml")) {
|
||||
yml = new String(in.readAllBytes(), java.nio.charset.StandardCharsets.UTF_8);
|
||||
}
|
||||
assertTrue(yml.replaceAll("\\s+", " ").toLowerCase().contains("mapper/**/*.xml"),
|
||||
"application.yml 的 mapper-locations 不含 mapper/**/*.xml —— XML 会被静默忽略,"
|
||||
+ "调用时才报 no statement");
|
||||
}
|
||||
|
||||
/** 生产走 @Param("rows"),MyBatis 会包成 ParamMap;测试要照这个形状喂,直接给 List 会命中 CollectionWrapper。 */
|
||||
private static Map<String, Object> param(List<AsinResultCacheEntity> rows) {
|
||||
Map<String, Object> parameter = new HashMap<>();
|
||||
parameter.put("rows", rows);
|
||||
return parameter;
|
||||
}
|
||||
|
||||
private static List<AsinResultCacheEntity> rows(int count) {
|
||||
List<AsinResultCacheEntity> rows = new ArrayList<>(count);
|
||||
for (int i = 0; i < count; i++) {
|
||||
AsinResultCacheEntity row = new AsinResultCacheEntity();
|
||||
row.setCountry("DE");
|
||||
row.setAsin("B00000000" + i);
|
||||
row.setAvailability(AsinResultCacheEntity.AVAILABILITY_OK);
|
||||
rows.add(row);
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
private static Configuration parseXml() throws Exception {
|
||||
MybatisConfiguration configuration = new MybatisConfiguration();
|
||||
try (InputStream in = Resources.getResourceAsStream(XML)) {
|
||||
new XMLMapperBuilder(in, configuration, XML, configuration.getSqlFragments()).parse();
|
||||
}
|
||||
return configuration;
|
||||
}
|
||||
|
||||
private static int countOccurrences(String haystack, String needle) {
|
||||
int at = 0;
|
||||
int count = 0;
|
||||
while ((at = haystack.indexOf(needle, at)) >= 0) {
|
||||
count++;
|
||||
at += needle.length();
|
||||
}
|
||||
return count;
|
||||
}
|
||||
}
|
||||
@@ -297,6 +297,7 @@ import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
|
||||
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm';
|
||||
import { TERMINAL_TASK_STATUSES, isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
|
||||
const MAX_TRANSIENT_ERRORS = 30;
|
||||
/** 任务终态后等待结果文件(Java 侧异步生成)的最大轮次,12 × 10s ≈ 2 分钟 */
|
||||
@@ -1016,57 +1017,46 @@ function findHistoryItemByTaskId(taskId: number) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0;
|
||||
let fileWaitRounds = 0;
|
||||
while (true) {
|
||||
if (disposed) return "STOPPED";
|
||||
if (activeTaskId.value !== taskId) return "DELETED";
|
||||
try {
|
||||
// DELETED 是本页专属终态(会话切走 / 任务行被删),不在通用集合里,必须显式列出
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
if (activeTaskId.value !== taskId) return "DELETED";
|
||||
const missingTaskIds = await refreshActiveTaskProgress([taskId]);
|
||||
if (missingTaskIds.includes(taskId)) {
|
||||
clearActiveQueueTask();
|
||||
return "DELETED";
|
||||
}
|
||||
if (activeTaskId.value !== taskId) return "DELETED";
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
}
|
||||
transientErrorCount = 0;
|
||||
const item = findHistoryItemByTaskId(taskId);
|
||||
const status = item?.taskStatus || "";
|
||||
if (status === "SUCCESS" || status === "FAILED" || status === "COMPLETED") {
|
||||
// 任务终态后结果 Excel 还在异步生成,必须继续轮询到文件就绪再退出:
|
||||
// 一旦退出,clearActiveQueueTask 会停掉历史轮询,fileReady 就再也刷不出来了
|
||||
if (isResultFilePending(item) && fileWaitRounds < MAX_FILE_WAIT_ROUNDS) {
|
||||
fileWaitRounds += 1;
|
||||
console.log(
|
||||
`[patrol-delete] 任务 ${taskId} 已终态(${status}),等待结果文件生成 ${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS}`,
|
||||
);
|
||||
queuePushResult.value = `任务 ${taskId} 已完成,正在生成结果文件(${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS})...`;
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
continue;
|
||||
}
|
||||
if (isResultFilePending(item)) {
|
||||
console.warn(
|
||||
`[patrol-delete] 任务 ${taskId} 结果文件等待超时(${MAX_FILE_WAIT_ROUNDS} 轮),按任务终态返回,可刷新页面查看`,
|
||||
);
|
||||
}
|
||||
return status;
|
||||
// 任务终态后结果 Excel 还在异步生成:报成"非终态"继续等,否则 clearActiveQueueTask
|
||||
// 停掉历史轮询后 fileReady 再也刷不出来
|
||||
if (isTerminalTaskStatus(status) && isResultFilePending(item) && fileWaitRounds < MAX_FILE_WAIT_ROUNDS) {
|
||||
fileWaitRounds += 1;
|
||||
console.log(`[patrol-delete] 任务 ${taskId} 已终态(${status}),等待结果文件生成 ${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS}`);
|
||||
queuePushResult.value = `任务 ${taskId} 已完成,正在生成结果文件(${fileWaitRounds}/${MAX_FILE_WAIT_ROUNDS})...`;
|
||||
return "";
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error;
|
||||
if (isTerminalTaskStatus(status) && isResultFilePending(item)) {
|
||||
console.warn(`[patrol-delete] 任务 ${taskId} 结果文件等待超时(${MAX_FILE_WAIT_ROUNDS} 轮),按任务终态返回,可刷新页面查看`);
|
||||
}
|
||||
transientErrorCount += 1;
|
||||
if (transientErrorCount >= MAX_TRANSIENT_ERRORS) {
|
||||
throw new Error(
|
||||
`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`,
|
||||
);
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${transientErrorCount}/${MAX_TRANSIENT_ERRORS})...`;
|
||||
}
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
}
|
||||
return status;
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
intervalMs: getTaskPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: MAX_TRANSIENT_ERRORS,
|
||||
terminal: [...TERMINAL_TASK_STATUSES, "DELETED"],
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -278,6 +278,7 @@ import {
|
||||
import { getPollingProgressBatch } from '@/shared/api/task-progress-polling.ts'
|
||||
import { formatDateTime } from '@/shared/utils/datetime'
|
||||
import { taskStatusClass, taskStatusText } from '@/shared/utils/task-status-text'
|
||||
import { isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
import { runBatchDelete } from '@/shared/utils/batch-delete'
|
||||
import { isRecordMissingError } from '@/shared/utils/task-queue-state.ts'
|
||||
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
@@ -1110,24 +1111,24 @@ async function compensateDispatchFailure(taskId: number, reason: string) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0
|
||||
const maxTransientErrors = 30
|
||||
while (true) {
|
||||
if (disposed) return 'STOPPED'
|
||||
try {
|
||||
const TRANSIENT = ['无法连接到服务', 'bad gateway', 'gateway timeout', 'network error', 'timeout', '502', '503', '504']
|
||||
// 消失与终态的收尾动作原本就是同一组,这里合并成一处
|
||||
const settle = async () => {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
syncPollingIdsWithHistory()
|
||||
}
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
// F5:等待终态的紧循环只读 status(轻量白名单覆盖),走 light 端点减小轮询响应体,异常回退重型 batch
|
||||
const batch = await getPollingProgressBatch('priceTrack', [taskId], {
|
||||
fallback: () => getPriceTrackTaskProgressBatch([taskId]),
|
||||
})
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
}
|
||||
transientErrorCount = 0
|
||||
const batch = await getPollingProgressBatch('priceTrack', [taskId], {
|
||||
fallback: () => getPriceTrackTaskProgressBatch([taskId]),
|
||||
})
|
||||
if ((batch.missingTaskIds || []).includes(taskId)) {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
syncPollingIdsWithHistory()
|
||||
await settle()
|
||||
return 'FAILED'
|
||||
}
|
||||
const detail = (batch.items || []).find((item) => item.task?.id === taskId)
|
||||
@@ -1142,30 +1143,27 @@ async function waitForTaskTerminal(taskId: number) {
|
||||
taskDetails.value = { ...taskDetails.value, [taskId]: status }
|
||||
saveTaskDetailsToStorage()
|
||||
}
|
||||
if (status === 'SUCCESS' || status === 'FAILED') {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
syncPollingIdsWithHistory()
|
||||
return status
|
||||
}
|
||||
} catch (error) {
|
||||
if (isTerminalTaskStatus(status)) await settle()
|
||||
return status
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${attempt}/${budget})...`
|
||||
if (attempt === 1 || attempt % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
},
|
||||
isTransient: (error: unknown) => {
|
||||
const message = (error instanceof Error ? error.message : String(error || '')).toLowerCase()
|
||||
const transient = ['无法连接到服务', 'bad gateway', 'gateway timeout', 'network error', 'timeout', '502', '503', '504'].some((pattern) => message.includes(pattern.toLowerCase()))
|
||||
if (!transient) throw error
|
||||
transientErrorCount += 1
|
||||
if (transientErrorCount >= maxTransientErrors) {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${transientErrorCount}/${maxTransientErrors})...`
|
||||
if (transientErrorCount === 1 || transientErrorCount % 5 === 0) {
|
||||
ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
continue
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
}
|
||||
return TRANSIENT.some((pattern) => message.includes(pattern.toLowerCase()))
|
||||
},
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
},
|
||||
intervalMs: getPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: 30,
|
||||
})
|
||||
}
|
||||
|
||||
function setLoopRun(next: PriceTrackLoopRunVo | null) {
|
||||
@@ -1444,7 +1442,7 @@ async function refreshTaskBatch() {
|
||||
}
|
||||
if (status) {
|
||||
taskDetails.value[taskId] = status
|
||||
if (status === 'SUCCESS' || status === 'FAILED') {
|
||||
if (isTerminalTaskStatus(status)) {
|
||||
console.log(`[price-track] 任务 ${taskId} 已到终态 ${status},移出轮询集合并刷新列表`)
|
||||
removePollingTask(taskId)
|
||||
settled = true
|
||||
|
||||
@@ -181,6 +181,7 @@ import { getPywebviewApi } from '@/shared/bridges/pywebview'
|
||||
import { getTaskPollIntervalMs } from '@/shared/task-progress-config'
|
||||
import { createCategorizedTimers } from '@/shared/utils/categorized-timers'
|
||||
import { saveUrlWithProgress } from '@/shared/utils/download-progress'
|
||||
import { isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
import { checkQueuePayload, guardBlocked } from '@/shared/dispatch-guard'
|
||||
import { passGuard } from '@/shared/dispatch-guard-ui'
|
||||
import ZiniaoVersionSetting from '@/shared/components/ZiniaoVersionSetting.vue'
|
||||
@@ -644,7 +645,7 @@ function taskStatusOf(taskId?: number) {
|
||||
}
|
||||
|
||||
function isTerminalStatus(status?: string) {
|
||||
return status === 'SUCCESS' || status === 'FAILED'
|
||||
return isTerminalTaskStatus(status)
|
||||
}
|
||||
|
||||
function isTaskTerminalById(taskId?: number) {
|
||||
@@ -874,28 +875,19 @@ function stopPolling() {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0
|
||||
const maxTransientErrors = 30
|
||||
while (true) {
|
||||
if (disposed) return 'STOPPED'
|
||||
try {
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
// F5:等待终态的紧循环只读 status,走 light 端点(异常回退重型 batch)
|
||||
const batch = await getPollingProgressBatch('productRisk', [taskId], {
|
||||
fallback: () => getProductRiskTaskProgressBatch([taskId]),
|
||||
})
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
}
|
||||
transientErrorCount = 0
|
||||
const detail = (batch.items || []).find((d) => d.task?.id === taskId)
|
||||
const status = detail?.task?.status || ''
|
||||
|
||||
if (detail) {
|
||||
const prev = taskSnapshots.value[taskId]
|
||||
taskSnapshots.value = {
|
||||
...taskSnapshots.value,
|
||||
[taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail,
|
||||
}
|
||||
taskSnapshots.value = { ...taskSnapshots.value, [taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail }
|
||||
triggerRef(taskSnapshots)
|
||||
saveTaskSnapshotsToStorage()
|
||||
}
|
||||
@@ -903,30 +895,28 @@ async function waitForTaskTerminal(taskId: number) {
|
||||
taskDetails.value[taskId] = status
|
||||
saveTaskDetailsToStorage()
|
||||
}
|
||||
|
||||
if (status === 'SUCCESS' || status === 'FAILED') {
|
||||
if (isTerminalTaskStatus(status)) {
|
||||
removePollingTask(taskId)
|
||||
await loadHistory()
|
||||
await loadDashboard()
|
||||
return status
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error
|
||||
}
|
||||
transientErrorCount += 1
|
||||
if (transientErrorCount >= maxTransientErrors) {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${transientErrorCount}/${maxTransientErrors})...`
|
||||
if (transientErrorCount === 1 || transientErrorCount % 5 === 0) {
|
||||
ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
continue
|
||||
}
|
||||
await sleep(getPollIntervalMs())
|
||||
}
|
||||
return status
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${attempt}/${budget})...`
|
||||
if (attempt === 1 || attempt % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`)
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`)
|
||||
},
|
||||
intervalMs: getPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: 30,
|
||||
})
|
||||
}
|
||||
|
||||
async function confirmAdd() {
|
||||
|
||||
@@ -252,6 +252,7 @@ import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
|
||||
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm';
|
||||
import { TERMINAL_TASK_STATUSES, isTerminalTaskStatus, waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
import { dispatchedPruneNotice, mergeDispatchedArchive, pruneRows } from '@/shared/utils/dispatch-row-prune';
|
||||
import {
|
||||
parseRememberedNames,
|
||||
@@ -996,37 +997,26 @@ function findHistoryItemByTaskId(taskId: number) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0;
|
||||
while (true) {
|
||||
if (disposed) return "STOPPED";
|
||||
try {
|
||||
// 取数与文案留在本页,循环骨架(disposed / 瞬断预算 / 每轮 sleep / 非瞬断上抛)走共用实现
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
await refreshActiveTaskProgress([taskId]);
|
||||
if (activeTaskId.value !== taskId) {
|
||||
return "FAILED";
|
||||
}
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
}
|
||||
transientErrorCount = 0;
|
||||
const item = findHistoryItemByTaskId(taskId);
|
||||
const status = item?.taskStatus || "";
|
||||
if (status === "SUCCESS" || status === "FAILED" || status === "COMPLETED") {
|
||||
return status;
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error;
|
||||
}
|
||||
transientErrorCount += 1;
|
||||
if (transientErrorCount >= MAX_TRANSIENT_ERRORS) {
|
||||
throw new Error(
|
||||
`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`,
|
||||
);
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${transientErrorCount}/${MAX_TRANSIENT_ERRORS})...`;
|
||||
}
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
}
|
||||
if (activeTaskId.value !== taskId) return "FAILED";
|
||||
return findHistoryItemByTaskId(taskId)?.taskStatus || "";
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
intervalMs: getTaskPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: MAX_TRANSIENT_ERRORS,
|
||||
});
|
||||
}
|
||||
|
||||
async function processQueue() {
|
||||
|
||||
@@ -138,6 +138,7 @@ import { useZiniaoVersion } from '@/shared/utils/ziniao-version'
|
||||
import { runBatchDelete } from '@/shared/utils/batch-delete'
|
||||
import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
|
||||
import { waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
|
||||
const COUNTRY_OPTIONS = [{ code: 'DE', label: '德国' }, { code: 'UK', label: '英国' }, { code: 'FR', label: '法国' }, { code: 'IT', label: '意大利' }, { code: 'ES', label: '西班牙' }] as const
|
||||
const shopInput = ref('')
|
||||
@@ -481,10 +482,56 @@ function getPollIntervalMs() { return getTaskPollIntervalMs() }
|
||||
function scheduleNextPoll(immediate = false) { if (disposed) return; if (pollTimer.value) { if (!immediate) return; timers.clearTimer('task-poll', pollTimer.value); pollTimer.value = null } const run = async () => { pollTimer.value = null; if (disposed) return; if (pollingInFlight.value || !pollingTaskIds.value.length) { if (pollingTaskIds.value.length) scheduleNextPoll(); return } pollingInFlight.value = true; try { const { settledTaskIds } = await refreshTaskBatch(); if (settledTaskIds.length) await Promise.allSettled([loadHistory(), loadDashboard()]) } finally { pollingInFlight.value = false } if (!disposed && pollingTaskIds.value.length) pollTimer.value = timers.setTimeout('task-poll', run, getPollIntervalMs()) }; if (immediate) void run(); else pollTimer.value = timers.setTimeout('task-poll', run, getPollIntervalMs()) }
|
||||
function ensurePolling(immediate = false) { scheduleNextPoll(immediate) }
|
||||
function stopPolling() { if (pollTimer.value) { timers.clearTimer('task-poll', pollTimer.value); pollTimer.value = null } }
|
||||
async function waitForTaskTerminal(taskId: number) { let transientErrorCount = 0; const maxTransientErrors = 30; while (true) { if (disposed) return 'STOPPED'; try { // F5:等待终态的紧循环只读 status,走 light 端点减小轮询响应体,异常回退重型 batch
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
// F5:等待终态的紧循环只读 status,走 light 端点减小轮询响应体,异常回退重型 batch
|
||||
const batch = await getPollingProgressBatch('shopMatch', [taskId], {
|
||||
fallback: () => getShopMatchTaskProgressBatch([taskId]),
|
||||
}); if (transientErrorCount > 0) queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`; transientErrorCount = 0; if ((batch.missingTaskIds || []).includes(taskId)) { removeTaskLocally(taskId); await refreshTaskViewsBestEffort(); restoreScheduledDispatches(); return 'FAILED' } const detail = (batch.items || []).find((item) => item.task?.id === taskId); const status = detail?.task?.status || ''; if (detail) { const prev = taskSnapshots.value[taskId]; taskSnapshots.value = { ...taskSnapshots.value, [taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail }; triggerRef(taskSnapshots); saveTaskSnapshotsToStorage() } if (status) { taskDetails.value[taskId] = status; saveTaskDetailsToStorage() } if (isTaskTerminalStatus(status)) { removePollingTask(taskId); await refreshTaskViewsBestEffort(); restoreScheduledDispatches(); return status } } catch (error) { if (!isTransientBackendError(error)) throw error; transientErrorCount += 1; if (transientErrorCount >= maxTransientErrors) throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`); queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${transientErrorCount}/${maxTransientErrors})...`; if (transientErrorCount === 1 || transientErrorCount % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`); await sleep(getPollIntervalMs()); continue } await sleep(getPollIntervalMs()) } }
|
||||
});
|
||||
if ((batch.missingTaskIds || []).includes(taskId)) {
|
||||
removeTaskLocally(taskId);
|
||||
await refreshTaskViewsBestEffort();
|
||||
restoreScheduledDispatches();
|
||||
return 'FAILED';
|
||||
}
|
||||
const detail = (batch.items || []).find((item) => item.task?.id === taskId);
|
||||
const status = detail?.task?.status || '';
|
||||
if (detail) {
|
||||
const prev = taskSnapshots.value[taskId];
|
||||
taskSnapshots.value = { ...taskSnapshots.value, [taskId]: prev ? { ...prev, task: { ...(prev.task || {}), ...(detail.task || {}) } } : detail };
|
||||
triggerRef(taskSnapshots);
|
||||
saveTaskSnapshotsToStorage();
|
||||
}
|
||||
if (status) {
|
||||
taskDetails.value[taskId] = status;
|
||||
saveTaskDetailsToStorage();
|
||||
}
|
||||
if (isTaskTerminalStatus(status)) {
|
||||
removePollingTask(taskId);
|
||||
await refreshTaskViewsBestEffort();
|
||||
restoreScheduledDispatches();
|
||||
}
|
||||
return status;
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 运行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
if (attempt === 1 || attempt % 5 === 0) ElMessage.warning(`任务 ${taskId} 运行中,服务暂时不可用,正在自动重试`);
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后手动刷新查看状态`);
|
||||
},
|
||||
intervalMs: getPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: 30,
|
||||
});
|
||||
}
|
||||
async function waitForScheduledTaskStageExit(taskId: number) {
|
||||
let transientErrorCount = 0
|
||||
const maxTransientErrors = 30
|
||||
|
||||
@@ -279,6 +279,7 @@ import { useTablePaging } from '@/shared/composables/useTablePaging.ts'
|
||||
import { getModuleProgressLight } from '@/shared/api/progress-light.ts'
|
||||
import { createRowsVersionTracker } from '@/shared/api/task-progress-polling.ts'
|
||||
import { confirmTaskDeletion } from '@/shared/task-delete-confirm'
|
||||
import { waitForTaskTerminal as waitForTaskTerminalShared } from '@/shared/utils/task-terminal'
|
||||
|
||||
const MAX_TRANSIENT_ERRORS = 30;
|
||||
const ziniaoVersion = useZiniaoVersion();
|
||||
@@ -1027,37 +1028,28 @@ function findHistoryItemByTaskId(taskId: number) {
|
||||
}
|
||||
|
||||
async function waitForTaskTerminal(taskId: number) {
|
||||
let transientErrorCount = 0;
|
||||
while (true) {
|
||||
if (disposed) return "STOPPED";
|
||||
try {
|
||||
return waitForTaskTerminalShared({
|
||||
taskId,
|
||||
isDisposed: () => disposed,
|
||||
pollStatus: async () => {
|
||||
await refreshActiveTaskProgress([taskId]);
|
||||
if (activeTaskId.value !== taskId) {
|
||||
return "FAILED";
|
||||
}
|
||||
if (transientErrorCount > 0) {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
}
|
||||
transientErrorCount = 0;
|
||||
const item = findHistoryItemByTaskId(taskId);
|
||||
const status = item?.taskStatus || "";
|
||||
if (status === "SUCCESS" || status === "FAILED" || status === "COMPLETED") {
|
||||
return status;
|
||||
}
|
||||
} catch (error) {
|
||||
if (!isTransientBackendError(error)) {
|
||||
throw error;
|
||||
}
|
||||
transientErrorCount += 1;
|
||||
if (transientErrorCount >= MAX_TRANSIENT_ERRORS) {
|
||||
throw new Error(
|
||||
`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`,
|
||||
);
|
||||
}
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${transientErrorCount}/${MAX_TRANSIENT_ERRORS})...`;
|
||||
}
|
||||
await sleep(getTaskPollIntervalMs());
|
||||
}
|
||||
if (activeTaskId.value !== taskId) return "FAILED";
|
||||
return findHistoryItemByTaskId(taskId)?.taskStatus || "";
|
||||
},
|
||||
onRecovered: () => {
|
||||
queuePushResult.value = `任务 ${taskId} 服务已恢复,继续等待执行结果...`;
|
||||
},
|
||||
onTransient: (attempt, budget) => {
|
||||
queuePushResult.value = `任务 ${taskId} 执行中,正在等待服务恢复(${attempt}/${budget})...`;
|
||||
},
|
||||
isTransient: isTransientBackendError,
|
||||
onBudgetExhausted: () => {
|
||||
throw new Error(`任务 ${taskId} 等待服务恢复超时,请稍后刷新查看状态`);
|
||||
},
|
||||
intervalMs: getTaskPollIntervalMs,
|
||||
sleep,
|
||||
transientBudget: MAX_TRANSIENT_ERRORS,
|
||||
});
|
||||
}
|
||||
|
||||
async function processQueue() {
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
/**
|
||||
* 任务终态等待的共用骨架(原先在 6 个品牌 Tab 里各写一份 while(true))。
|
||||
*
|
||||
* 抽这一层的原因不是"代码重复",而是**终态集合六份不一致**:
|
||||
* PriceTrack / ProductRisk / ShopMatch 三页只认 `SUCCESS|FAILED`,另三页认 `SUCCESS|COMPLETED|FAILED`。
|
||||
* 而 COMPLETED≡SUCCESS 在两头早就定了:本仓统一文案表 `shared/utils/task-status-text.ts`
|
||||
* 把两者都映射成「已完成」/success 样式,后端看板 `TaskCenterQueryMapper.SUCCESS_STATUSES_ORDERED`
|
||||
* 也是 List.of("SUCCESS","COMPLETED")。窄集合那三页一旦收到 COMPLETED(后端 delete-brand 链路
|
||||
* 与本地会话态 `BrandDeleteBrandTab:611` 都会产出这个值)就会**一路空转到 30 次瞬断预算耗尽**,
|
||||
* 用户看到的是"任务永远执行中",而服务端那边任务早就结束了。
|
||||
*
|
||||
* 除状态外的差异(取数方式、提示文案、页专属副作用)留在调用方回调里,本文件不统一它们:
|
||||
* 那部分是各页的业务形状,合并只会把差异藏起来。
|
||||
*/
|
||||
|
||||
/** 与 task-status-text 的 success/failed 分类一致;CANCELLED 不在任务等待面出现,故不列。 */
|
||||
export const TERMINAL_TASK_STATUSES: readonly string[] = ['SUCCESS', 'COMPLETED', 'FAILED']
|
||||
|
||||
export function isTerminalTaskStatus(status?: string): boolean {
|
||||
if (!status) return false
|
||||
return TERMINAL_TASK_STATUSES.includes(status.trim().toUpperCase())
|
||||
}
|
||||
|
||||
/** 各页瞬断容忍次数原本都是 30,抽成默认值以免第六份再抄一遍。 */
|
||||
export const DEFAULT_TRANSIENT_BUDGET = 30
|
||||
|
||||
export interface TaskTerminalWait {
|
||||
taskId: number
|
||||
/** 页面卸载/停止时返回 true ⇒ 立刻以 'STOPPED' 退出(原先六页都写 `if (disposed) return 'STOPPED'`)。 */
|
||||
isDisposed: () => boolean
|
||||
/**
|
||||
* 取一次状态。返回空串表示"还没到终态,继续等"。
|
||||
* 页专属判定(任务行被删、会话切走、结果文件还没生成)留在这里,
|
||||
* 需要立刻收尾时返回一个终态值即可——`DELETED` / `FAILED` 由各页自己决定,骨架不猜。
|
||||
*/
|
||||
pollStatus: () => Promise<string>
|
||||
/** 每轮一次的页专属副作用(合并快照、刷新进度文案)。 */
|
||||
onStatus?: (status: string) => void
|
||||
/** 瞬断后恢复时的一次提示。 */
|
||||
onRecovered?: () => void
|
||||
/** 每次瞬断的提示(attempt 从 1 开始)。 */
|
||||
onTransient?: (attempt: number, budget: number) => void
|
||||
/** 瞬断判定,沿用各页原有的 TRANSIENT_BACKEND_ERROR_PATTERNS 口径。 */
|
||||
isTransient: (error: unknown) => boolean
|
||||
/** 预算耗尽:六页原本都是 throw(措辞各异),所以默认抛通用文案。 */
|
||||
onBudgetExhausted?: (attempt: number) => never
|
||||
intervalMs: () => number
|
||||
sleep: (ms: number) => Promise<void>
|
||||
transientBudget?: number
|
||||
terminal?: readonly string[]
|
||||
}
|
||||
|
||||
/**
|
||||
* 等到任务终态并返回那个状态字符串。
|
||||
*
|
||||
* 与旧实现保持同一点行为:非瞬断异常照常上抛(不吞),只有被 `isTransient` 认出的错误才计预算;
|
||||
* 预算内的每一轮都 sleep 后再看,disposed 优先于一切判定先返回。
|
||||
*/
|
||||
export async function waitForTaskTerminal(wait: TaskTerminalWait): Promise<string> {
|
||||
const budget = wait.transientBudget ?? DEFAULT_TRANSIENT_BUDGET
|
||||
const terminal = wait.terminal ?? TERMINAL_TASK_STATUSES
|
||||
let transientErrors = 0
|
||||
|
||||
while (true) {
|
||||
if (wait.isDisposed()) return 'STOPPED'
|
||||
try {
|
||||
const status = await wait.pollStatus()
|
||||
if (transientErrors > 0) wait.onRecovered?.()
|
||||
transientErrors = 0
|
||||
wait.onStatus?.(status)
|
||||
const normalized = (status || '').trim().toUpperCase()
|
||||
if (normalized && terminal.includes(normalized)) return normalized
|
||||
} catch (error) {
|
||||
if (!wait.isTransient(error)) throw error
|
||||
transientErrors += 1
|
||||
if (transientErrors >= budget) {
|
||||
if (wait.onBudgetExhausted) return wait.onBudgetExhausted(transientErrors)
|
||||
throw new Error(`任务 ${wait.taskId} 等待服务恢复超时,请稍后刷新查看状态`)
|
||||
}
|
||||
wait.onTransient?.(transientErrors, budget)
|
||||
}
|
||||
await wait.sleep(wait.intervalMs())
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
// 终态集合只能有一套:六个品牌 Tab 的"任务到没到终态"判定不许再各写一遍字面量。
|
||||
// 跑法:npm test
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { fileURLToPath } from 'node:url'
|
||||
import { resolve, dirname } from 'node:path'
|
||||
|
||||
import { TERMINAL_TASK_STATUSES } from '../src/shared/utils/task-terminal.ts'
|
||||
|
||||
const here = dirname(fileURLToPath(import.meta.url))
|
||||
const TABS = [
|
||||
'BrandPatrolDeleteTab.vue',
|
||||
'BrandPriceTrackTab.vue',
|
||||
'BrandProductRiskTab.vue',
|
||||
'BrandQueryAsinTab.vue',
|
||||
'BrandShopMatchTab.vue',
|
||||
'BrandWithdrawTab.vue',
|
||||
]
|
||||
|
||||
/**
|
||||
* 只抓"SUCCESS|FAILED 两个就收尾"的窄集合写法。
|
||||
* 后面还跟着 COMPLETED / STOPPED 的不算——巡掉/循环跑那类另有自己的终态词表,
|
||||
* 判据一旦误红,下次就没人信它。
|
||||
*/
|
||||
const NARROW_TERMINAL = /===\s*'SUCCESS'\s*\|\|\s*status\s*===\s*'FAILED'\s*\)/g
|
||||
|
||||
function findNarrow(source: string): number[] {
|
||||
return [...source.matchAll(NARROW_TERMINAL)].map((m) => source.slice(0, m.index).split('\n').length)
|
||||
}
|
||||
|
||||
test('判据自己先自证:窄写法要被抓到、宽写法不许误报', () => {
|
||||
assert.deepEqual(findNarrow("if (status === 'SUCCESS' || status === 'FAILED') {"), [1])
|
||||
assert.deepEqual(findNarrow("if (status === 'SUCCESS' || status === 'FAILED' || status === 'COMPLETED') {"), [],
|
||||
'含 COMPLETED 的是宽集合,不该报')
|
||||
assert.deepEqual(findNarrow("return status === 'SUCCESS' || status === 'FAILED' || status === 'STOPPED'"), [],
|
||||
'循环跑另有词表,不该报')
|
||||
assert.deepEqual(findNarrow("if (isTerminalTaskStatus(status))"), [], '共用判定不该报')
|
||||
})
|
||||
|
||||
test('六个 Tab 里再无窄终态集合', () => {
|
||||
const offenders: string[] = []
|
||||
for (const tab of TABS) {
|
||||
const source = readFileSync(resolve(here, '../src/pages/brand/components', tab), 'utf-8')
|
||||
const lines = findNarrow(source)
|
||||
if (lines.length) offenders.push(`${tab}:${lines.join(',')}`)
|
||||
}
|
||||
assert.deepEqual(offenders, [], `这些位置只认 SUCCESS|FAILED:收到 COMPLETED 会空转到瞬断预算耗尽 —— ${offenders}`)
|
||||
})
|
||||
|
||||
/** 只截 waitForTaskTerminal 的函数体:别处的同名局部变量不该被这条判据算进来。 */
|
||||
function waitBody(source: string, tab: string): string {
|
||||
const start = source.indexOf('async function waitForTaskTerminal(taskId: number)')
|
||||
assert.notEqual(start, -1, `${tab} 里没有 waitForTaskTerminal`)
|
||||
let depth = 0
|
||||
let i = source.indexOf('{', start)
|
||||
for (; i < source.length; i += 1) {
|
||||
if (source[i] === '{') depth += 1
|
||||
else if (source[i] === '}') {
|
||||
depth -= 1
|
||||
if (depth === 0) break
|
||||
}
|
||||
}
|
||||
return source.slice(start, i + 1)
|
||||
}
|
||||
|
||||
test('六个 Tab 的等待循环都真的走了共用骨架', () => {
|
||||
const offenders: string[] = []
|
||||
for (const tab of TABS) {
|
||||
const source = readFileSync(resolve(here, '../src/pages/brand/components', tab), 'utf-8')
|
||||
const body = waitBody(source, tab)
|
||||
if (!body.includes('waitForTaskTerminalShared(')) offenders.push(`${tab} 没调骨架`)
|
||||
// 骨架之外不该再有第二份 while (true) 的等待循环:`let transientErrorCount` 是它的签名
|
||||
if (/let transientErrorCount/.test(body)) offenders.push(`${tab} 仍自己数瞬断`)
|
||||
if (/while\s*\(\s*true\s*\)/.test(body)) offenders.push(`${tab} 仍自己写循环`)
|
||||
}
|
||||
assert.deepEqual(offenders, [], `这些页还在各写一份循环:${offenders}`)
|
||||
})
|
||||
|
||||
test('被改宽的两页确实改用共用判定了', () => {
|
||||
for (const tab of ['BrandPriceTrackTab.vue', 'BrandProductRiskTab.vue']) {
|
||||
const source = readFileSync(resolve(here, '../src/pages/brand/components', tab), 'utf-8')
|
||||
assert.match(source, /from '@\/shared\/utils\/task-terminal'/, `${tab} 没引共用终态判定`)
|
||||
assert.ok(source.includes('isTerminalTaskStatus('), `${tab} 引了但没用`)
|
||||
}
|
||||
})
|
||||
|
||||
test('COMPLETED 与 SUCCESS 同类的口径两头都有出处', () => {
|
||||
// 前端显示表:两个状态都是「已完成」/success 样式
|
||||
const display = readFileSync(resolve(here, '../src/shared/utils/task-status-text.ts'), 'utf-8')
|
||||
for (const key of TERMINAL_TASK_STATUSES) {
|
||||
assert.ok(display.includes(`${key}:`), `显示表里没有 ${key},统一集合就成了无源之水`)
|
||||
}
|
||||
assert.equal(display.includes("SUCCESS: '已完成'") && display.includes("COMPLETED: '已完成'"), true,
|
||||
'COMPLETED≡SUCCESS 的前提是这张表,它变了就得重新对账')
|
||||
})
|
||||
@@ -0,0 +1,118 @@
|
||||
// 任务终态等待骨架的行为契约。跑法:npm test(node --test tests/*.test.ts)
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
|
||||
import {
|
||||
DEFAULT_TRANSIENT_BUDGET,
|
||||
TERMINAL_TASK_STATUSES,
|
||||
isTerminalTaskStatus,
|
||||
waitForTaskTerminal,
|
||||
} from '../src/shared/utils/task-terminal.ts'
|
||||
|
||||
/**
|
||||
* 只替 IO 边界(取数/睡眠/ disposed),循环本体真跑。
|
||||
* sleep 里把 disposed 置上,避免非终态分支把用例吊死;keepPolling 让状态序列能走完。
|
||||
*/
|
||||
function harness(overrides: any = {}) {
|
||||
const state: any = {
|
||||
disposed: false,
|
||||
statuses: [] as string[],
|
||||
errors: [] as Error[],
|
||||
sleeps: [] as number[],
|
||||
keepPolling: false,
|
||||
...overrides,
|
||||
}
|
||||
const base: any = {
|
||||
taskId: 7,
|
||||
isDisposed: () => state.disposed,
|
||||
pollStatus: async () => {
|
||||
if (state.errors.length) throw state.errors.shift()
|
||||
return state.statuses.length > 1 ? state.statuses.shift() : state.statuses[0] ?? ''
|
||||
},
|
||||
intervalMs: () => 1000,
|
||||
isTransient: (error: any) =>
|
||||
/502|503|504|无法连接到服务|bad gateway|gateway timeout|network error|timeout/i.test(
|
||||
String(error?.message ?? error),
|
||||
),
|
||||
sleep: async (ms: number) => {
|
||||
state.sleeps.push(ms)
|
||||
if (!state.keepPolling) state.disposed = true
|
||||
},
|
||||
}
|
||||
return { state, base }
|
||||
}
|
||||
|
||||
test('COMPLETED 是终态:窄集合那三页以前会空转到预算耗尽', async () => {
|
||||
const { base, state } = harness({ keepPolling: true })
|
||||
state.statuses = ['RUNNING', 'COMPLETED']
|
||||
|
||||
assert.equal(await waitForTaskTerminal(base), 'COMPLETED')
|
||||
assert.equal(state.statuses.length, 1, 'COMPLETED 命中后不该继续把队列取空')
|
||||
})
|
||||
|
||||
test('SUCCESS 与 FAILED 同样立即终止', async () => {
|
||||
for (const status of ['SUCCESS', 'FAILED']) {
|
||||
const { base } = harness()
|
||||
base.pollStatus = async () => status
|
||||
assert.equal(await waitForTaskTerminal(base), status)
|
||||
}
|
||||
})
|
||||
|
||||
test('非终态继续等,并且每轮按页面给的间隔睡一次', async () => {
|
||||
const { base, state } = harness({ keepPolling: true })
|
||||
state.statuses = ['RUNNING', 'PENDING', 'QUEUED', 'SUCCESS']
|
||||
|
||||
assert.equal(await waitForTaskTerminal(base), 'SUCCESS')
|
||||
assert.equal(state.sleeps.length, 3, '前三轮非终态各睡一次,第四轮命中即返回')
|
||||
assert.ok(state.sleeps.every((ms) => ms === 1000), 'sleep 用的是 intervalMs 的值')
|
||||
})
|
||||
|
||||
test('disposed 优先于一切判定', async () => {
|
||||
const { base, state } = harness()
|
||||
state.disposed = true
|
||||
state.statuses = ['SUCCESS']
|
||||
assert.equal(await waitForTaskTerminal(base), 'STOPPED')
|
||||
})
|
||||
|
||||
test('瞬断计预算、恢复后清零、耗尽时抛错', async () => {
|
||||
const transient = () => new Error('502 Bad Gateway')
|
||||
|
||||
const recovered = harness({ keepPolling: true })
|
||||
const attempts: number[][] = []
|
||||
recovered.base.onTransient = (attempt: number, budget: number) => attempts.push([attempt, budget])
|
||||
recovered.state.errors = [transient(), transient()]
|
||||
recovered.state.statuses = ['RUNNING', 'SUCCESS']
|
||||
assert.equal(await waitForTaskTerminal(recovered.base), 'SUCCESS')
|
||||
assert.deepEqual(attempts, [[1, DEFAULT_TRANSIENT_BUDGET], [2, DEFAULT_TRANSIENT_BUDGET]])
|
||||
|
||||
const exhausted = harness({ keepPolling: true })
|
||||
exhausted.state.statuses = ['RUNNING']
|
||||
exhausted.state.errors = Array.from({ length: DEFAULT_TRANSIENT_BUDGET }, transient)
|
||||
await assert.rejects(() => waitForTaskTerminal(exhausted.base), /等待服务恢复超时/)
|
||||
})
|
||||
|
||||
test('非瞬断异常直接上抛,不被骨架吞掉', async () => {
|
||||
const { base, state } = harness({ keepPolling: true })
|
||||
state.errors = [new Error('任务不存在')]
|
||||
state.statuses = ['RUNNING']
|
||||
await assert.rejects(() => waitForTaskTerminal(base), /任务不存在/)
|
||||
})
|
||||
|
||||
test('页专属终态(DELETED)必须显式传 terminal 才生效', async () => {
|
||||
const { base } = harness({ keepPolling: true })
|
||||
base.pollStatus = async () => 'DELETED'
|
||||
|
||||
// 默认集合里没有 DELETED ⇒ 巡店删除页必须自己把它列进 terminal,否则会永远等下去
|
||||
const widened = await waitForTaskTerminal({
|
||||
...base,
|
||||
terminal: [...TERMINAL_TASK_STATUSES, 'DELETED'],
|
||||
})
|
||||
assert.equal(widened, 'DELETED')
|
||||
})
|
||||
|
||||
test('isTerminalTaskStatus 与集合口径一致', () => {
|
||||
assert.equal(isTerminalTaskStatus('completed'), true, '大小写不敏感')
|
||||
assert.equal(isTerminalTaskStatus(' RUNNING '), false)
|
||||
assert.equal(isTerminalTaskStatus(undefined), false, '空状态不能算终态')
|
||||
assert.deepEqual([...TERMINAL_TASK_STATUSES].sort(), ['COMPLETED', 'FAILED', 'SUCCESS'])
|
||||
})
|
||||
Reference in New Issue
Block a user