task-15: 拆分 similar-asin 模块 API 至 types/modules/similar-asin.ts，java-modules.ts re-export

- parseSimilarAsin/getSimilarAsinDashboard/getSimilarAsinHistory/getSimilarAsinTaskProgressBatch/activateSimilarAsinTask/deleteSimilarAsinTask/deleteSimilarAsinHistory/getSimilarAsinResultDownloadUrl - similar-asin 全套类型随模块迁移；progressBatch 内联缓存+超时实现（与 java-modules 同构） - 9 个测试：parse URL/payload/默认值/dashboard/history/progressBatch 去重+超时/activate/delete/download/export compat
2026-08-31 19:34:56 +08:00
parent b93d338eac
commit d7104d35da
3 changed files with 414 additions and 182 deletions
@@ -14,6 +14,7 @@ export * from "./types/modules/dedupe.ts";
 export * from "./types/modules/split.ts";
 export * from "./types/modules/convert.ts";
 export * from "./types/modules/publish.ts";
+export * from "./types/modules/similar-asin.ts";

 const JAVA_API_PREFIX = "/newApi/api";

@@ -1865,188 +1866,6 @@ export function getAppearancePatentResultDownloadUrl(resultId: number) {
  return getJavaDownloadUrl(`/appearance-patent/results/${resultId}/download`);
 }

-// ========== 货源查询 ==========
-
-export interface SimilarAsinParsedRow {
-  rowIndex: number;
-  sourceFileKey?: string;
-  sourceFilename?: string;
-  sourceId: string;
-  displayId: string;
-  rowToken?: string;
-  groupKey?: string;
-  asin: string;
-  country: string;
-  sku?: string;
-  price?: string;
-  url?: string;
-  title?: string;
-}
-
-export interface SimilarAsinParsedGroup {
-  sourceFileKey?: string;
-  sourceFilename?: string;
-  groupKey?: string;
-  baseId?: string;
-  displayId?: string;
-  itemCount?: number;
-  items: SimilarAsinParsedRow[];
-}
-
-export interface SimilarAsinParseVo {
-  taskId: number;
-  sourceFilename?: string;
-  sourceFileCount?: number;
-  totalRows: number;
-  acceptedRows: number;
-  droppedRows: number;
-  groupCount?: number;
-  aiPrompt?: string;
-  imgSwitch?: boolean;
-  categorySwitch?: boolean;
-  items: SimilarAsinParsedRow[];
-  groups?: SimilarAsinParsedGroup[];
-}
-
-export interface SimilarAsinDashboardVo {
-  pendingTaskCount: number;
-  processedTaskCount: number;
-  successTaskCount: number;
-  failedTaskCount: number;
-}
-
-export interface SimilarAsinHistoryItem {
-  resultId?: number;
-  taskId?: number;
-  sourceFilename?: string;
-  resultFilename?: string;
-  downloadUrl?: string;
-  fileJobId?: number;
-  fileStatus?: string;
-  fileError?: string;
-  fileReady?: boolean;
-  fileProgressPercent?: number;
-  fileProgressCurrent?: number;
-  fileProgressTotal?: number;
-  fileProgressMessage?: string;
-  taskStatus?: string;
-  success?: boolean;
-  error?: string;
-  rowCount?: number;
-  createdAt?: string;
-  startedAt?: string;
-  finishedAt?: string;
-}
-
-export interface SimilarAsinHistoryVo {
-  items: SimilarAsinHistoryItem[];
-}
-
-export interface SimilarAsinTaskSummary {
-  id?: number;
-  taskNo?: string;
-  status?: string;
-  errorMessage?: string;
-  createdAt?: string;
-  updatedAt?: string;
-  finishedAt?: string;
-}
-
-export interface SimilarAsinTaskDetailVo {
-  task?: SimilarAsinTaskSummary;
-  items?: SimilarAsinHistoryItem[];
-}
-
-export interface SimilarAsinTaskBatchVo {
-  items: SimilarAsinTaskDetailVo[];
-  missingTaskIds?: number[];
-}
-
-export function parseSimilarAsin(
-  files: UploadedFileRef[],
-  apiKey?: string,
-  imgSwitch = false,
-  categorySwitch = false,
-) {
-  return unwrapJavaResponse(
-    post<
-      JavaApiResponse<SimilarAsinParseVo>,
-      {
-        user_id: number;
-        files: UploadedFileRef[];
-        api_key?: string;
-        img_switch: boolean;
-        category_switch: boolean;
-      }
-    >(`${JAVA_API_PREFIX}/similar-asin/parse`, {
-      user_id: getCurrentUserId(),
-      files,
-      api_key: apiKey,
-      img_switch: imgSwitch,
-      category_switch: categorySwitch,
-    }),
-  );
-}
-
-export function getSimilarAsinDashboard() {
-  return unwrapJavaResponse(
-    get<JavaApiResponse<SimilarAsinDashboardVo>>(
-      `${JAVA_API_PREFIX}/similar-asin/dashboard`,
-      { params: { user_id: getCurrentUserId() } },
-    ),
-  );
-}
-
-export function getSimilarAsinHistory() {
-  return unwrapJavaResponse(
-    get<JavaApiResponse<SimilarAsinHistoryVo>>(
-      `${JAVA_API_PREFIX}/similar-asin/history`,
-      { params: { user_id: getCurrentUserId(), limit: 50 } },
-    ),
-  );
-}
-
-export function getSimilarAsinTaskProgressBatch(
-  taskIds: number[],
-  options: TaskProgressBatchOptions = {},
-) {
-  return postTaskProgressBatch<SimilarAsinTaskBatchVo>(
-    `${JAVA_API_PREFIX}/similar-asin/tasks/progress/batch`,
-    taskIds,
-    options,
-  );
-}
-
-export function activateSimilarAsinTask(taskId: number) {
-  return unwrapJavaResponse(
-    post<JavaApiResponse<null>, undefined>(
-      `${JAVA_API_PREFIX}/similar-asin/tasks/${taskId}/activate?user_id=${encodeURIComponent(String(getCurrentUserId()))}`,
-      undefined,
-    ),
-  );
-}
-
-export function deleteSimilarAsinTask(taskId: number) {
-  return unwrapJavaResponse(
-    del<JavaApiResponse<null>>(`${JAVA_API_PREFIX}/similar-asin/tasks/${taskId}`, {
-      params: { user_id: getCurrentUserId() },
-    }),
-  );
-}
-
-export function deleteSimilarAsinHistory(resultId: number) {
-  return unwrapJavaResponse(
-    del<JavaApiResponse<null>>(
-      `${JAVA_API_PREFIX}/similar-asin/history/${resultId}`,
-      { params: { user_id: getCurrentUserId() } },
-    ),
-  );
-}
-
-export function getSimilarAsinResultDownloadUrl(resultId: number) {
-  return getJavaDownloadUrl(`/similar-asin/results/${resultId}/download`);
-}
-
 // ========== 跟价 ==========

 export interface PriceTrackCandidateVo {
@@ -0,0 +1,252 @@
+import { get, post, del, type JavaApiResponse, unwrapJavaResponse } from '../../http.ts'
+import { buildJavaUrl, JAVA_API_PREFIX } from '../../url.ts'
+import { getCurrentUserId } from '../../user.ts'
+import { getJavaDownloadUrl } from '../../download-url.ts'
+import { getTaskProgressCacheTtlMs, getTaskProgressTimeoutMs } from '../../../task-progress-config.ts'
+import { createTaskProgressRequestCache } from '../../../task-progress-request-cache.ts'
+import type { UploadedFileRef } from '../upload.ts'
+import { API_ENDPOINTS } from '../../endpoints.ts'
+
+export interface SimilarAsinParsedRow {
+  rowIndex: number;
+  sourceFileKey?: string;
+  sourceFilename?: string;
+  sourceId: string;
+  displayId: string;
+  rowToken?: string;
+  groupKey?: string;
+  asin: string;
+  country: string;
+  sku?: string;
+  price?: string;
+  url?: string;
+  title?: string;
+}
+
+export interface SimilarAsinParsedGroup {
+  sourceFileKey?: string;
+  sourceFilename?: string;
+  groupKey?: string;
+  baseId?: string;
+  displayId?: string;
+  itemCount?: number;
+  items: SimilarAsinParsedRow[];
+}
+
+export interface SimilarAsinParseVo {
+  taskId: number;
+  sourceFilename?: string;
+  sourceFileCount?: number;
+  totalRows: number;
+  acceptedRows: number;
+  droppedRows: number;
+  groupCount?: number;
+  aiPrompt?: string;
+  imgSwitch?: boolean;
+  categorySwitch?: boolean;
+  items: SimilarAsinParsedRow[];
+  groups?: SimilarAsinParsedGroup[];
+}
+
+export interface SimilarAsinDashboardVo {
+  pendingTaskCount: number;
+  processedTaskCount: number;
+  successTaskCount: number;
+  failedTaskCount: number;
+}
+
+export interface SimilarAsinHistoryItem {
+  resultId?: number;
+  taskId?: number;
+  sourceFilename?: string;
+  resultFilename?: string;
+  downloadUrl?: string;
+  fileJobId?: number;
+  fileStatus?: string;
+  fileError?: string;
+  fileReady?: boolean;
+  fileProgressPercent?: number;
+  fileProgressCurrent?: number;
+  fileProgressTotal?: number;
+  fileProgressMessage?: string;
+  taskStatus?: string;
+  success?: boolean;
+  error?: string;
+  rowCount?: number;
+  createdAt?: string;
+  startedAt?: string;
+  finishedAt?: string;
+}
+
+export interface SimilarAsinHistoryVo {
+  items: SimilarAsinHistoryItem[];
+}
+
+export interface SimilarAsinTaskSummary {
+  id?: number;
+  taskNo?: string;
+  status?: string;
+  errorMessage?: string;
+  createdAt?: string;
+  updatedAt?: string;
+  finishedAt?: string;
+}
+
+export interface SimilarAsinTaskDetailVo {
+  task?: SimilarAsinTaskSummary;
+  items?: SimilarAsinHistoryItem[];
+}
+
+export interface SimilarAsinTaskBatchVo {
+  items: SimilarAsinTaskDetailVo[];
+  missingTaskIds?: number[];
+}
+
+interface TaskProgressBatchOptions {
+  force?: boolean;
+}
+
+const taskProgressResponseCache = createTaskProgressRequestCache<unknown>({
+  ttlMs: () => getTaskProgressCacheTtlMs(),
+  maxEntries: 100,
+  maxInflight: 16,
+});
+
+function normalizeTaskIds(taskIds: number[]) {
+  return Array.from(
+    new Set(
+      (taskIds || [])
+        .map((taskId) => Number(taskId))
+        .filter((taskId) => Number.isFinite(taskId) && taskId > 0),
+    ),
+  ).sort((left, right) => left - right);
+}
+
+function buildTaskProgressRequestKey(path: string, taskIds: number[]) {
+  return `${path}::${taskIds.join(",")}`;
+}
+
+async function postTaskProgressBatch<T>(
+  path: string,
+  taskIds: number[],
+  options: TaskProgressBatchOptions = {},
+) {
+  const normalizedTaskIds = normalizeTaskIds(taskIds);
+  if (!normalizedTaskIds.length) {
+    return { items: [], missingTaskIds: [] } as T;
+  }
+
+  const cacheKey = buildTaskProgressRequestKey(path, normalizedTaskIds);
+  const cached = taskProgressResponseCache.get(cacheKey);
+  if (!options.force && cached !== undefined) {
+    return cached as T;
+  }
+
+  const inflight = taskProgressResponseCache.getInflight(cacheKey);
+  if (!options.force && inflight) {
+    return (await inflight) as T;
+  }
+
+  const requestPromise = unwrapJavaResponse(
+    post<JavaApiResponse<T>, { taskIds: number[] }>(path, { taskIds: normalizedTaskIds }, {
+      timeout: getTaskProgressTimeoutMs(),
+    }),
+  )
+    .then((data) => {
+      taskProgressResponseCache.set(cacheKey, data);
+      return data;
+    })
+    .finally(() => {
+      taskProgressResponseCache.endInflight(cacheKey);
+    });
+
+  taskProgressResponseCache.startInflight(cacheKey, requestPromise);
+  return requestPromise;
+}
+
+export function parseSimilarAsin(
+  files: UploadedFileRef[],
+  apiKey?: string,
+  imgSwitch = false,
+  categorySwitch = false,
+) {
+  return unwrapJavaResponse(
+    post<
+      JavaApiResponse<SimilarAsinParseVo>,
+      {
+        user_id: number;
+        files: UploadedFileRef[];
+        api_key?: string;
+        img_switch: boolean;
+        category_switch: boolean;
+      }
+    >(buildJavaUrl(API_ENDPOINTS.similarAsin.parse), {
+      user_id: getCurrentUserId(),
+      files,
+      api_key: apiKey,
+      img_switch: imgSwitch,
+      category_switch: categorySwitch,
+    }),
+  );
+}
+
+export function getSimilarAsinDashboard() {
+  return unwrapJavaResponse(
+    get<JavaApiResponse<SimilarAsinDashboardVo>>(
+      buildJavaUrl(API_ENDPOINTS.similarAsin.dashboard),
+      { params: { user_id: getCurrentUserId() } },
+    ),
+  );
+}
+
+export function getSimilarAsinHistory() {
+  return unwrapJavaResponse(
+    get<JavaApiResponse<SimilarAsinHistoryVo>>(
+      buildJavaUrl(API_ENDPOINTS.similarAsin.history),
+      { params: { user_id: getCurrentUserId(), limit: 50 } },
+    ),
+  );
+}
+
+export function getSimilarAsinTaskProgressBatch(
+  taskIds: number[],
+  options: TaskProgressBatchOptions = {},
+) {
+  return postTaskProgressBatch<SimilarAsinTaskBatchVo>(
+    `${JAVA_API_PREFIX}/similar-asin/tasks/progress/batch`,
+    taskIds,
+    options,
+  );
+}
+
+export function activateSimilarAsinTask(taskId: number) {
+  return unwrapJavaResponse(
+    post<JavaApiResponse<null>, undefined>(
+      `${JAVA_API_PREFIX}/similar-asin/tasks/${taskId}/activate?user_id=${encodeURIComponent(String(getCurrentUserId()))}`,
+      undefined,
+    ),
+  );
+}
+
+export function deleteSimilarAsinTask(taskId: number) {
+  return unwrapJavaResponse(
+    del<JavaApiResponse<null>>(`${JAVA_API_PREFIX}/similar-asin/tasks/${taskId}`, {
+      params: { user_id: getCurrentUserId() },
+    }),
+  );
+}
+
+export function deleteSimilarAsinHistory(resultId: number) {
+  return unwrapJavaResponse(
+    del<JavaApiResponse<null>>(
+      `${JAVA_API_PREFIX}/similar-asin/history/${resultId}`,
+      { params: { user_id: getCurrentUserId() } },
+    ),
+  );
+}
+
+export function getSimilarAsinResultDownloadUrl(resultId: number) {
+  return getJavaDownloadUrl(
+    API_ENDPOINTS.similarAsin.resultDownload.replace('{resultId}', String(resultId)),
+  );
+}
@@ -0,0 +1,161 @@
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { http } from '../src/shared/api/http.ts'
+import {
+  parseSimilarAsin,
+  getSimilarAsinDashboard,
+  getSimilarAsinHistory,
+  getSimilarAsinTaskProgressBatch,
+  activateSimilarAsinTask,
+  deleteSimilarAsinTask,
+  deleteSimilarAsinHistory,
+  getSimilarAsinResultDownloadUrl,
+  type SimilarAsinTaskBatchVo,
+} from '../src/shared/api/types/modules/similar-asin.ts'
+
+function setupWindow() {
+  ;(globalThis as Record<string, unknown>).window = {
+    localStorage: { getItem: () => '42' },
+    location: { origin: 'http://localhost' },
+  }
+}
+
+function mockRequest(
+  t: Parameters<typeof test>[1] extends (t: infer T) => unknown ? T : never,
+  impl: (config: { url?: string; method?: string; params?: Record<string, unknown>; data?: unknown; timeout?: number }) => Promise<unknown>,
+) {
+  t.mock.method(http, 'request', impl as never)
+}
+
+const okResponse = (data: unknown) => Promise.resolve({ data: { success: true, message: 'ok', data } })
+
+test('test_similar_asin_parse_url_payload', async (t) => {
+  setupWindow()
+  let captured: { url?: string; method?: string; data?: unknown } = {}
+  mockRequest(t, (config) => {
+    captured = config
+    return okResponse({ taskId: 1, totalRows: 1, acceptedRows: 1, droppedRows: 0, items: [] })
+  })
+  await parseSimilarAsin([{ fileKey: 'k1' }], 'api-key-1', true, true)
+  assert.equal(captured.url, '/newApi/api/similar-asin/parse')
+  assert.equal(captured.method, 'POST')
+  assert.deepEqual(captured.data, {
+    user_id: 42,
+    files: [{ fileKey: 'k1' }],
+    api_key: 'api-key-1',
+    img_switch: true,
+    category_switch: true,
+  })
+})
+
+test('test_similar_asin_parse_defaults', async (t) => {
+  setupWindow()
+  let captured: { data?: unknown } = {}
+  mockRequest(t, (config) => {
+    captured = config
+    return okResponse({ taskId: 1, totalRows: 1, acceptedRows: 1, droppedRows: 0, items: [] })
+  })
+  await parseSimilarAsin([{ fileKey: 'k1' }])
+  assert.deepEqual(captured.data, {
+    user_id: 42,
+    files: [{ fileKey: 'k1' }],
+    api_key: undefined,
+    img_switch: false,
+    category_switch: false,
+  })
+})
+
+test('test_similar_asin_dashboard', async (t) => {
+  setupWindow()
+  let captured: { url?: string; params?: Record<string, unknown> } = {}
+  mockRequest(t, (config) => {
+    captured = config
+    return okResponse({ pendingTaskCount: 1, processedTaskCount: 2, successTaskCount: 1, failedTaskCount: 1 })
+  })
+  const result = await getSimilarAsinDashboard()
+  assert.equal(captured.url, '/newApi/api/similar-asin/dashboard')
+  assert.deepEqual(captured.params, { user_id: 42 })
+  assert.equal(result.successTaskCount, 1)
+})
+
+test('test_similar_asin_history', async (t) => {
+  setupWindow()
+  let captured: { url?: string; params?: Record<string, unknown> } = {}
+  mockRequest(t, (config) => {
+    captured = config
+    return okResponse({ items: [] })
+  })
+  await getSimilarAsinHistory()
+  assert.equal(captured.url, '/newApi/api/similar-asin/history')
+  assert.deepEqual(captured.params, { user_id: 42, limit: 50 })
+})
+
+test('test_similar_asin_progress_batch_timeout', async (t) => {
+  setupWindow()
+  let captured: { url?: string; method?: string; data?: unknown; timeout?: number } = {}
+  mockRequest(t, (config) => {
+    captured = config
+    return okResponse({ items: [], missingTaskIds: [] })
+  })
+  const result = await getSimilarAsinTaskProgressBatch([5, 3])
+  assert.equal(captured.url, '/newApi/api/similar-asin/tasks/progress/batch')
+  assert.equal(captured.method, 'POST')
+  assert.deepEqual(captured.data, { taskIds: [3, 5] })
+  assert.equal(captured.timeout, 10000)
+  assert.deepEqual(result, { items: [], missingTaskIds: [] })
+
+  const empty = await getSimilarAsinTaskProgressBatch([])
+  assert.deepEqual(empty as SimilarAsinTaskBatchVo, { items: [], missingTaskIds: [] })
+})
+
+test('test_similar_asin_activate', async (t) => {
+  setupWindow()
+  let captured: { url?: string; method?: string } = {}
+  mockRequest(t, (config) => {
+    captured = config
+    return okResponse(null)
+  })
+  await activateSimilarAsinTask(7)
+  assert.equal(captured.url, '/newApi/api/similar-asin/tasks/7/activate?user_id=42')
+  assert.equal(captured.method, 'POST')
+})
+
+test('test_similar_asin_delete_task_history', async (t) => {
+  setupWindow()
+  const calls: { url?: string; method?: string; params?: Record<string, unknown> }[] = []
+  mockRequest(t, (config) => {
+    calls.push(config)
+    return okResponse(null)
+  })
+  await deleteSimilarAsinTask(7)
+  await deleteSimilarAsinHistory(9)
+  assert.equal(calls[0].url, '/newApi/api/similar-asin/tasks/7')
+  assert.equal(calls[0].method, 'DELETE')
+  assert.deepEqual(calls[0].params, { user_id: 42 })
+  assert.equal(calls[1].url, '/newApi/api/similar-asin/history/9')
+  assert.equal(calls[1].method, 'DELETE')
+  assert.deepEqual(calls[1].params, { user_id: 42 })
+})
+
+test('test_similar_asin_download_url', async (t) => {
+  setupWindow()
+  const url = getSimilarAsinResultDownloadUrl(7)
+  assert.equal(url, 'http://localhost/newApi/api/similar-asin/results/7/download?user_id=42')
+})
+
+test('test_similar_asin_export_compat', async (t) => {
+  setupWindow()
+  const fromJavaModules = await import('../src/shared/api/java-modules.ts')
+  const fromSimilar = await import('../src/shared/api/types/modules/similar-asin.ts')
+  const names = [
+    'parseSimilarAsin', 'getSimilarAsinDashboard', 'getSimilarAsinHistory',
+    'getSimilarAsinTaskProgressBatch', 'activateSimilarAsinTask',
+    'deleteSimilarAsinTask', 'deleteSimilarAsinHistory', 'getSimilarAsinResultDownloadUrl',
+  ]
+  for (const name of names) {
+    assert.equal(fromJavaModules[name], fromSimilar[name], `${name} 应为同一引用`)
+  }
+  const row = { rowIndex: 1, sourceId: 's1', displayId: 'd1', asin: 'B001', country: 'US' }
+  assert.equal(row.asin, 'B001')
+  assert.equal(fromJavaModules.UploadedFileRef, undefined)
+})