@chenchaolong/plugin-trade-compliance-workbench 1.0.118 → 1.0.120

package/dist/lib/workbench.service.js

@@ -11,7 +11,7 @@ import { join } from 'node:path';
 import { finished } from 'node:stream/promises';
 import { createHash, randomUUID } from 'node:crypto';
 import { BankAccountSettings, CatalogReviewBlock, CompanySanctionMatch, CompanySettings, ControlledCatalogBatch, ControlledCatalogImportIssue, ControlledGoodsRecord, Customer, CustomerContract, CustomerContractAnalysisRun, CustomerContractClause, CustomerContractClauseAnalysis, DerivedSalesOrderManualData, GeneratedSalesFile, ImportTask, ManagedAsset, MonthlySafeExchangeRate, ProductComplianceMatch, ProfitRuleSettings, PurchaseOrder, PurchaseOrderLine, SanctionCatalogBatch, SanctionCatalogImportIssue, SanctionedCompanyAlias, SanctionedCompanyRecord, SettingsHistory, Supplier } from './entities/index.js';
-import { CATALOG_REVIEW_BATCH_LIMIT } from './constants.js';
+import { CATALOG_REVIEW_BATCH_LIMIT, CATALOG_REVIEW_LEASE_MS, CATALOG_TRANSLATION_REVIEW_LEASE_MS } from './constants.js';
 import { CatalogTypes, ClauseTypes, CustomerProfitRateStatuses, DomainError, DomainErrorCodes, RefundValidationMethods, RiskLevels, SalesPaymentStatuses, SanctionHitStatuses, StalledCatalogImportDecisions } from './types.js';
 import { deriveSalesLine, assertReceivedAmount } from './domain/finance.js';
 import { parseCustomerContractNo, parsePurchaseContractNo } from './domain/contract-number.js';
@@ -694,7 +694,12 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     }
     async getImportTaskResult(scope, taskId) {
         await this.expireStaleImportTasks(scope);
-        const task = await required(this.dataSource.getRepository(ImportTask).findOne({ where: { ...activeScope(scope), id: taskId, deletedAt: IsNull() } }), '解析任务不存在');
+        const taskRepo = this.dataSource.getRepository(ImportTask);
+        let task = await taskRepo.findOne({ where: { ...activeScope(scope), id: taskId, deletedAt: IsNull() } });
+        task ??= await taskRepo.findOne({ where: { ...activeScope(scope), id: taskId } });
+        if (!task)
+            throw new DomainError(DomainErrorCodes.NOT_FOUND, '解析任务不存在');
+        task = await this.recoverExpiredCatalogReviewLeases(scope, task) ?? task;
         const publicTask = (await this.publicImportTaskDtos([task]))[0];
         if (!task.resultEntityId)
             return { task: publicTask };
@@ -1375,7 +1380,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
             if (blocks.length === 0)
                 return null;
             const leaseToken = randomUUID();
-            const leaseExpiresAt = new Date(Date.now() + 10 * 60_000);
+            const leaseExpiresAt = new Date(Date.now() + CATALOG_TRANSLATION_REVIEW_LEASE_MS);
             for (const block of blocks) {
                 block.status = 'LEASED';
                 block.leaseToken = leaseToken;
@@ -1403,12 +1408,45 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
     async countCatalogReviewBlocks(scope, taskId) {
         return this.dataSource.getRepository(CatalogReviewBlock).count({ where: { ...activeScope(scope), importTaskId: taskId, status: In(['PENDING', 'LEASED']) } });
     }
+    async recoverExpiredCatalogReviewLeases(scope, task) {
+        if ((task.documentType !== 'CONTROLLED_CATALOG' && task.documentType !== 'SANCTION_CATALOG') ||
+            task.status !== 'AWAITING_REVIEW' || !task.progress)
+            return null;
+        return this.dataSource.transaction(async (manager) => {
+            const taskRepo = manager.getRepository(ImportTask);
+            const locked = await taskRepo.findOne({
+                where: { ...activeScope(scope), id: task.id, deletedAt: IsNull() },
+                lock: { mode: 'pessimistic_write' }
+            });
+            if (!locked || locked.status !== 'AWAITING_REVIEW')
+                return null;
+            await this.recoverExpiredCatalogReviewLeasesInTransaction(manager, scope, locked);
+            return locked;
+        });
+    }
+    async recoverExpiredCatalogReviewLeasesInTransaction(manager, scope, task) {
+        if (task.documentType !== 'CONTROLLED_CATALOG' && task.documentType !== 'SANCTION_CATALOG')
+            return task.progress?.reviewPendingCount ?? 0;
+        const repo = manager.getRepository(CatalogReviewBlock);
+        await repo.update({
+            ...activeScope(scope), importTaskId: task.id, status: 'LEASED', leaseExpiresAt: LessThanOrEqual(new Date())
+        }, { status: 'PENDING', leaseToken: null, leaseExpiresAt: null });
+        const previousPendingCount = task.progress?.reviewPendingCount;
+        const pendingCount = await this.reconcileCatalogReviewPendingCount(repo, scope, task);
+        if (task.progress && previousPendingCount !== pendingCount) {
+            task.progress.progressVersion += 1;
+            task.progress.lastProgressAt = new Date().toISOString();
+            await manager.getRepository(ImportTask).save(task);
+        }
+        return pendingCount;
+    }
     async waitImportProgress(scope, taskId, afterProgressVersion = 0, waitMs = 10_000) {
         const deadline = Date.now() + Math.max(0, Math.min(waitMs, 10_000));
         while (true) {
-            const task = await required(this.dataSource.getRepository(ImportTask).findOne({
+            let task = await required(this.dataSource.getRepository(ImportTask).findOne({
                 where: { ...activeScope(scope), id: taskId }
             }), '解析任务不存在');
+            task = await this.recoverExpiredCatalogReviewLeases(scope, task) ?? task;
             const version = task.progress?.progressVersion ?? 0;
             if (version > afterProgressVersion || TERMINAL_IMPORT_TASK_STATUSES.includes(task.status)) {
                 return { task: publicImportTaskDto(task) };
@@ -1429,16 +1467,7 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 throw new DomainError(DomainErrorCodes.INVALID_INPUT, '仅目录任务包含复核块');
             }
             const repo = manager.getRepository(CatalogReviewBlock);
-            await repo.update({
-                ...activeScope(scope), importTaskId: taskId, status: 'LEASED', leaseExpiresAt: LessThanOrEqual(new Date())
-            }, { status: 'PENDING', leaseToken: null, leaseExpiresAt: null });
-            const previousPendingCount = task.progress?.reviewPendingCount;
-            const pendingCount = await this.reconcileCatalogReviewPendingCount(repo, scope, task);
-            if (task.progress && previousPendingCount !== pendingCount) {
-                task.progress.progressVersion += 1;
-                task.progress.lastProgressAt = new Date().toISOString();
-                await manager.getRepository(ImportTask).save(task);
-            }
+            await this.recoverExpiredCatalogReviewLeasesInTransaction(manager, scope, task);
             const blocks = await repo.createQueryBuilder('block')
                 .setLock('pessimistic_write')
                 .setOnLocked('skip_locked')
@@ -1449,10 +1478,34 @@ let TradeComplianceWorkbenchService = class TradeComplianceWorkbenchService {
                 .addOrderBy('block.id', 'ASC')
                 .limit(limit)
                 .getMany();
-            if (blocks.length === 0)
-                return { leaseToken: null, items: [] };
+            if (blocks.length === 0) {
+                const leased = await repo.createQueryBuilder('block')
+                    .setLock('pessimistic_write')
+                    .setOnLocked('skip_locked')
+                    .where('block."tenantId" = :tenantId AND block."organizationId" = :organizationId AND block."importTaskId" = :taskId AND block.status = :status', {
+                    ...activeScope(scope), taskId, status: 'LEASED'
+                })
+                    .andWhere('block."leaseExpiresAt" IS NOT NULL')
+                    .orderBy('block."leaseExpiresAt"', 'ASC')
+                    .addOrderBy('block.ordinal', 'ASC')
+                    .addOrderBy('block.id', 'ASC')
+                    .limit(1)
+                    .getOne();
+                if (!leased)
+                    return { leaseToken: null, items: [] };
+                const leasedUntil = leased.leaseExpiresAt instanceof Date ? leased.leaseExpiresAt : null;
+                const leaseExpiresAt = leasedUntil?.toISOString() ?? null;
+                const retryAfterMs = leasedUntil ? Math.max(1000, leasedUntil.getTime() - Date.now()) : 5000;
+                return {
+                    leaseToken: null,
+                    items: [],
+                    leaseExpiresAt,
+                    retryAfterMs,
+                    instruction: '当前待复核块仍被占用，请等待 retryAfterMs 后再调用 nextReviewBatch。'
+                };
+            }
             const leaseToken = randomUUID();
-            const leaseExpiresAt = new Date(Date.now() + 5 * 60_000);
+            const leaseExpiresAt = new Date(Date.now() + CATALOG_REVIEW_LEASE_MS);
             for (const block of blocks) {
                 block.status = 'LEASED';
                 block.leaseToken = leaseToken;