task-14: 拆分 publish 模块 API 至 types/modules/publish.ts，java-modules.ts re-export
- parsePublish/activatePublishTask/activatePublishFile/getPublishItemsPage/getPublishItemsPageUrl/getPublishTaskProgressBatch/submitPublishTaskResult/getPublishDashboard/getPublishHistory/deletePublishTask - Publish 全套类型随模块迁移；progressBatch 保留 task_ids 请求体并应用进度超时 - 10 个测试：parse URL/超时/activate/itemsPage 参数/itemsPageUrl/progressBatch 去重+超时/submitResult 请求体/dashboard/delete/export compat
This commit is contained in:
@@ -13,6 +13,7 @@ import { createTaskProgressRequestCache } from "../task-progress-request-cache.t
|
||||
export * from "./types/modules/dedupe.ts";
|
||||
export * from "./types/modules/split.ts";
|
||||
export * from "./types/modules/convert.ts";
|
||||
export * from "./types/modules/publish.ts";
|
||||
|
||||
const JAVA_API_PREFIX = "/newApi/api";
|
||||
|
||||
@@ -3018,277 +3019,6 @@ export function failCollectDataTask(taskId: number, error?: string) {
|
||||
);
|
||||
}
|
||||
|
||||
// ========== 上架 ==========
|
||||
|
||||
export interface PublishSourceFile {
|
||||
fileKey: string;
|
||||
originalFilename?: string;
|
||||
relativePath?: string;
|
||||
}
|
||||
|
||||
export interface PublishParseRequest {
|
||||
user_id: number;
|
||||
files: PublishSourceFile[];
|
||||
publish_country: string;
|
||||
sync_countries: string[];
|
||||
}
|
||||
|
||||
export interface PublishFileItem {
|
||||
fileId: number;
|
||||
fileKey?: string;
|
||||
sourceFilename?: string;
|
||||
shopName?: string;
|
||||
shopId?: string;
|
||||
matchedUserId?: number;
|
||||
platform?: string;
|
||||
companyName?: string;
|
||||
matched?: boolean;
|
||||
matchStatus?: string;
|
||||
matchMessage?: string;
|
||||
status?: string;
|
||||
error?: string;
|
||||
errorMessage?: string;
|
||||
totalRows?: number;
|
||||
processedRows?: number;
|
||||
progressCurrent?: number;
|
||||
progressTotal?: number;
|
||||
progressPercent?: number;
|
||||
percent?: number;
|
||||
progressMessage?: string;
|
||||
pageSize?: number;
|
||||
totalPages?: number;
|
||||
pageUrl?: string;
|
||||
}
|
||||
|
||||
export interface PublishTaskResult {
|
||||
resultId?: number;
|
||||
downloadUrl?: string;
|
||||
resultFilename?: string;
|
||||
fileReady?: boolean;
|
||||
fileJobId?: number;
|
||||
fileJobStatus?: string;
|
||||
fileJobRetryCount?: number;
|
||||
fileJobError?: string;
|
||||
errorMessage?: string;
|
||||
}
|
||||
|
||||
export interface PublishTaskSummary {
|
||||
id: number;
|
||||
taskNo?: string;
|
||||
status?: string;
|
||||
sourceFileCount?: number;
|
||||
totalRows?: number;
|
||||
successFileCount?: number;
|
||||
failedFileCount?: number;
|
||||
completedFileCount?: number;
|
||||
errorMessage?: string;
|
||||
processedRows?: number;
|
||||
percent?: number;
|
||||
createdAt?: string;
|
||||
updatedAt?: string;
|
||||
startedAt?: string;
|
||||
finishedAt?: string;
|
||||
downloadUrl?: string;
|
||||
resultFilename?: string;
|
||||
}
|
||||
|
||||
export interface PublishTaskDetailVo {
|
||||
task: PublishTaskSummary;
|
||||
files: PublishFileItem[];
|
||||
result?: PublishTaskResult;
|
||||
}
|
||||
|
||||
export interface PublishParseVo {
|
||||
taskId: number;
|
||||
taskNo?: string;
|
||||
sourceFileCount?: number;
|
||||
totalRows?: number;
|
||||
pageSize?: number;
|
||||
files: PublishFileItem[];
|
||||
result?: PublishTaskResult;
|
||||
}
|
||||
|
||||
export interface PublishTaskBatchVo {
|
||||
items: PublishTaskDetailVo[];
|
||||
missingTaskIds?: number[];
|
||||
}
|
||||
|
||||
export interface PublishHistoryVo {
|
||||
total?: number;
|
||||
items: PublishTaskDetailVo[];
|
||||
}
|
||||
|
||||
export interface PublishDashboardVo {
|
||||
pendingCount: number;
|
||||
runningCount: number;
|
||||
successCount: number;
|
||||
failedCount: number;
|
||||
recent?: PublishTaskDetailVo[];
|
||||
}
|
||||
|
||||
export interface PublishItemVo {
|
||||
id?: number;
|
||||
rowIndex?: number;
|
||||
fileId?: number;
|
||||
fileKey?: string;
|
||||
sourceFilename?: string;
|
||||
values?: Record<string, unknown>;
|
||||
data?: Record<string, unknown>;
|
||||
}
|
||||
|
||||
export interface PublishItemsPageVo {
|
||||
taskId?: number;
|
||||
fileId?: number;
|
||||
taskStatus?: string;
|
||||
fileStatus?: string;
|
||||
shopName?: string;
|
||||
shopId?: string;
|
||||
platform?: string;
|
||||
companyName?: string;
|
||||
publishCountry?: string;
|
||||
syncCountries?: string[];
|
||||
page: number;
|
||||
pageSize: number;
|
||||
total: number;
|
||||
totalPages: number;
|
||||
count?: number;
|
||||
items: PublishItemVo[];
|
||||
}
|
||||
|
||||
export interface PublishTaskResultFileRequest {
|
||||
fileId: number;
|
||||
fileKey?: string;
|
||||
sourceFilename?: string;
|
||||
error?: string;
|
||||
rows: unknown[];
|
||||
}
|
||||
|
||||
export interface PublishTaskResultRequest {
|
||||
user_id?: number;
|
||||
files: PublishTaskResultFileRequest[];
|
||||
}
|
||||
|
||||
export function parsePublish(
|
||||
request: Omit<PublishParseRequest, "user_id"> | PublishParseRequest,
|
||||
) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<PublishParseVo>, PublishParseRequest>(
|
||||
`${JAVA_API_PREFIX}/publish/parse`,
|
||||
{ ...request, user_id: getCurrentUserId() },
|
||||
{ timeout: 180000 },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function activatePublishTask(taskId: number) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<null>, undefined>(
|
||||
`${JAVA_API_PREFIX}/publish/tasks/${taskId}/activate`,
|
||||
undefined,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function activatePublishFile(taskId: number, fileId: number) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<null>, undefined>(
|
||||
`${JAVA_API_PREFIX}/publish/tasks/${taskId}/files/${fileId}/activate`,
|
||||
undefined,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishItemsPage(
|
||||
taskId: number,
|
||||
fileId: number,
|
||||
page: number = 1,
|
||||
pageSize: number = 100,
|
||||
) {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<PublishItemsPageVo>>(
|
||||
`${JAVA_API_PREFIX}/publish/tasks/${taskId}/items`,
|
||||
{
|
||||
params: {
|
||||
file_id: fileId,
|
||||
page,
|
||||
page_size: pageSize,
|
||||
},
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishItemsPageUrl(
|
||||
taskId: number,
|
||||
fileId: number,
|
||||
pageSize: number = 100,
|
||||
page: number = 1,
|
||||
) {
|
||||
let raw = `${JAVA_API_PREFIX}/publish/tasks/${taskId}/items`;
|
||||
if (typeof window !== "undefined") {
|
||||
raw = `${window.location.origin}${raw}`;
|
||||
}
|
||||
const params = new URLSearchParams({
|
||||
file_id: String(fileId),
|
||||
page: String(page),
|
||||
page_size: String(pageSize),
|
||||
});
|
||||
return `${raw}?${params.toString()}`;
|
||||
}
|
||||
|
||||
export function getPublishTaskProgressBatch(taskIds: number[]) {
|
||||
const normalizedTaskIds = normalizeTaskIds(taskIds);
|
||||
if (!normalizedTaskIds.length) {
|
||||
return Promise.resolve({ items: [], missingTaskIds: [] } as PublishTaskBatchVo);
|
||||
}
|
||||
return unwrapJavaResponse(
|
||||
post<
|
||||
JavaApiResponse<PublishTaskBatchVo>,
|
||||
{ task_ids: number[] }
|
||||
>(`${JAVA_API_PREFIX}/publish/tasks/progress/batch`, {
|
||||
task_ids: normalizedTaskIds,
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
export function submitPublishTaskResult(
|
||||
taskId: number,
|
||||
request: PublishTaskResultRequest,
|
||||
) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<null>, PublishTaskResultRequest>(
|
||||
`${JAVA_API_PREFIX}/publish/tasks/${taskId}/result`,
|
||||
{ ...request },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishDashboard() {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<PublishDashboardVo>>(
|
||||
`${JAVA_API_PREFIX}/publish/dashboard`,
|
||||
{ params: { user_id: getCurrentUserId() } },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishHistory() {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<PublishHistoryVo>>(
|
||||
`${JAVA_API_PREFIX}/publish/history`,
|
||||
{ params: { user_id: getCurrentUserId() } },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function deletePublishTask(taskId: number) {
|
||||
return unwrapJavaResponse(
|
||||
del<JavaApiResponse<null>>(`${JAVA_API_PREFIX}/publish/tasks/${taskId}`, {
|
||||
params: { user_id: getCurrentUserId() },
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
export function getJavaDownloadUrl(path: string) {
|
||||
let raw =
|
||||
path.startsWith("http://") || path.startsWith("https://")
|
||||
|
||||
@@ -0,0 +1,284 @@
|
||||
import { get, post, del, type JavaApiResponse, unwrapJavaResponse } from '../../http.ts'
|
||||
import { buildJavaUrl, JAVA_API_PREFIX } from '../../url.ts'
|
||||
import { getCurrentUserId } from '../../user.ts'
|
||||
import { getTaskProgressTimeoutMs } from '../../../task-progress-config.ts'
|
||||
import { API_ENDPOINTS } from '../../endpoints.ts'
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
export interface PublishSourceFile {
|
||||
fileKey: string;
|
||||
originalFilename?: string;
|
||||
relativePath?: string;
|
||||
}
|
||||
|
||||
export interface PublishParseRequest {
|
||||
user_id: number;
|
||||
files: PublishSourceFile[];
|
||||
publish_country: string;
|
||||
sync_countries: string[];
|
||||
}
|
||||
|
||||
export interface PublishFileItem {
|
||||
fileId: number;
|
||||
fileKey?: string;
|
||||
sourceFilename?: string;
|
||||
shopName?: string;
|
||||
shopId?: string;
|
||||
matchedUserId?: number;
|
||||
platform?: string;
|
||||
companyName?: string;
|
||||
matched?: boolean;
|
||||
matchStatus?: string;
|
||||
matchMessage?: string;
|
||||
status?: string;
|
||||
error?: string;
|
||||
errorMessage?: string;
|
||||
totalRows?: number;
|
||||
processedRows?: number;
|
||||
progressCurrent?: number;
|
||||
progressTotal?: number;
|
||||
progressPercent?: number;
|
||||
percent?: number;
|
||||
progressMessage?: string;
|
||||
pageSize?: number;
|
||||
totalPages?: number;
|
||||
pageUrl?: string;
|
||||
}
|
||||
|
||||
export interface PublishTaskResult {
|
||||
resultId?: number;
|
||||
downloadUrl?: string;
|
||||
resultFilename?: string;
|
||||
fileReady?: boolean;
|
||||
fileJobId?: number;
|
||||
fileJobStatus?: string;
|
||||
fileJobRetryCount?: number;
|
||||
fileJobError?: string;
|
||||
errorMessage?: string;
|
||||
}
|
||||
|
||||
export interface PublishTaskSummary {
|
||||
id: number;
|
||||
taskNo?: string;
|
||||
status?: string;
|
||||
sourceFileCount?: number;
|
||||
totalRows?: number;
|
||||
successFileCount?: number;
|
||||
failedFileCount?: number;
|
||||
completedFileCount?: number;
|
||||
errorMessage?: string;
|
||||
processedRows?: number;
|
||||
percent?: number;
|
||||
createdAt?: string;
|
||||
updatedAt?: string;
|
||||
startedAt?: string;
|
||||
finishedAt?: string;
|
||||
downloadUrl?: string;
|
||||
resultFilename?: string;
|
||||
}
|
||||
|
||||
export interface PublishTaskDetailVo {
|
||||
task: PublishTaskSummary;
|
||||
files: PublishFileItem[];
|
||||
result?: PublishTaskResult;
|
||||
}
|
||||
|
||||
export interface PublishParseVo {
|
||||
taskId: number;
|
||||
taskNo?: string;
|
||||
sourceFileCount?: number;
|
||||
totalRows?: number;
|
||||
pageSize?: number;
|
||||
files: PublishFileItem[];
|
||||
result?: PublishTaskResult;
|
||||
}
|
||||
|
||||
export interface PublishTaskBatchVo {
|
||||
items: PublishTaskDetailVo[];
|
||||
missingTaskIds?: number[];
|
||||
}
|
||||
|
||||
export interface PublishHistoryVo {
|
||||
total?: number;
|
||||
items: PublishTaskDetailVo[];
|
||||
}
|
||||
|
||||
export interface PublishDashboardVo {
|
||||
pendingCount: number;
|
||||
runningCount: number;
|
||||
successCount: number;
|
||||
failedCount: number;
|
||||
recent?: PublishTaskDetailVo[];
|
||||
}
|
||||
|
||||
export interface PublishItemVo {
|
||||
id?: number;
|
||||
rowIndex?: number;
|
||||
fileId?: number;
|
||||
fileKey?: string;
|
||||
sourceFilename?: string;
|
||||
values?: Record<string, unknown>;
|
||||
data?: Record<string, unknown>;
|
||||
}
|
||||
|
||||
export interface PublishItemsPageVo {
|
||||
taskId?: number;
|
||||
fileId?: number;
|
||||
taskStatus?: string;
|
||||
fileStatus?: string;
|
||||
shopName?: string;
|
||||
shopId?: string;
|
||||
platform?: string;
|
||||
companyName?: string;
|
||||
publishCountry?: string;
|
||||
syncCountries?: string[];
|
||||
page: number;
|
||||
pageSize: number;
|
||||
total: number;
|
||||
totalPages: number;
|
||||
count?: number;
|
||||
items: PublishItemVo[];
|
||||
}
|
||||
|
||||
export interface PublishTaskResultFileRequest {
|
||||
fileId: number;
|
||||
fileKey?: string;
|
||||
sourceFilename?: string;
|
||||
error?: string;
|
||||
rows: unknown[];
|
||||
}
|
||||
|
||||
export interface PublishTaskResultRequest {
|
||||
user_id?: number;
|
||||
files: PublishTaskResultFileRequest[];
|
||||
}
|
||||
|
||||
export function parsePublish(
|
||||
request: Omit<PublishParseRequest, "user_id"> | PublishParseRequest,
|
||||
) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<PublishParseVo>, PublishParseRequest>(
|
||||
buildJavaUrl(API_ENDPOINTS.publish.parse),
|
||||
{ ...request, user_id: getCurrentUserId() },
|
||||
{ timeout: 180000 },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function activatePublishTask(taskId: number) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<null>, undefined>(
|
||||
buildJavaUrl(API_ENDPOINTS.publish.taskActivate.replace('{taskId}', String(taskId))),
|
||||
undefined,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function activatePublishFile(taskId: number, fileId: number) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<null>, undefined>(
|
||||
buildJavaUrl(API_ENDPOINTS.publish.fileActivate.replace('{taskId}', String(taskId)).replace('{fileId}', String(fileId))),
|
||||
undefined,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishItemsPage(
|
||||
taskId: number,
|
||||
fileId: number,
|
||||
page: number = 1,
|
||||
pageSize: number = 100,
|
||||
) {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<PublishItemsPageVo>>(
|
||||
buildJavaUrl(API_ENDPOINTS.publish.items.replace('{taskId}', String(taskId))),
|
||||
{
|
||||
params: {
|
||||
file_id: fileId,
|
||||
page,
|
||||
page_size: pageSize,
|
||||
},
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishItemsPageUrl(
|
||||
taskId: number,
|
||||
fileId: number,
|
||||
pageSize: number = 100,
|
||||
page: number = 1,
|
||||
) {
|
||||
let raw = `${JAVA_API_PREFIX}/publish/tasks/${taskId}/items`;
|
||||
if (typeof window !== "undefined") {
|
||||
raw = `${window.location.origin}${raw}`;
|
||||
}
|
||||
const params = new URLSearchParams({
|
||||
file_id: String(fileId),
|
||||
page: String(page),
|
||||
page_size: String(pageSize),
|
||||
});
|
||||
return `${raw}?${params.toString()}`;
|
||||
}
|
||||
|
||||
export function getPublishTaskProgressBatch(taskIds: number[]) {
|
||||
const normalizedTaskIds = normalizeTaskIds(taskIds);
|
||||
if (!normalizedTaskIds.length) {
|
||||
return Promise.resolve({ items: [], missingTaskIds: [] } as PublishTaskBatchVo);
|
||||
}
|
||||
return unwrapJavaResponse(
|
||||
post<
|
||||
JavaApiResponse<PublishTaskBatchVo>,
|
||||
{ task_ids: number[] }
|
||||
>(buildJavaUrl(API_ENDPOINTS.publish.progressBatch), {
|
||||
task_ids: normalizedTaskIds,
|
||||
}, { timeout: getTaskProgressTimeoutMs() }),
|
||||
);
|
||||
}
|
||||
|
||||
export function submitPublishTaskResult(
|
||||
taskId: number,
|
||||
request: PublishTaskResultRequest,
|
||||
) {
|
||||
return unwrapJavaResponse(
|
||||
post<JavaApiResponse<null>, PublishTaskResultRequest>(
|
||||
buildJavaUrl(API_ENDPOINTS.publish.result.replace('{taskId}', String(taskId))),
|
||||
{ ...request },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishDashboard() {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<PublishDashboardVo>>(
|
||||
buildJavaUrl(API_ENDPOINTS.publish.dashboard),
|
||||
{ params: { user_id: getCurrentUserId() } },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function getPublishHistory() {
|
||||
return unwrapJavaResponse(
|
||||
get<JavaApiResponse<PublishHistoryVo>>(
|
||||
buildJavaUrl(API_ENDPOINTS.publish.history),
|
||||
{ params: { user_id: getCurrentUserId() } },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function deletePublishTask(taskId: number) {
|
||||
return unwrapJavaResponse(
|
||||
del<JavaApiResponse<null>>(buildJavaUrl(API_ENDPOINTS.publish.taskDelete.replace('{taskId}', String(taskId))), {
|
||||
params: { user_id: getCurrentUserId() },
|
||||
}),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user