@jsonstudio/rcc 0.89.611 → 0.89.683

package/dist/server/runtime/http-server/request-executor.js

@@ -4,11 +4,13 @@ import { attachProviderRuntimeMetadata } from '../../../providers/core/runtime/p
 import { extractAnthropicToolAliasMap } from './anthropic-tool-alias.js';
 import { enhanceProviderRequestId } from '../../utils/request-id-manager.js';
 import { emitProviderError } from '../../../providers/core/utils/provider-error-reporter.js';
-import { extractSessionIdentifiersFromMetadata } from '../../../../sharedmodule/llmswitch-core/dist/conversion/hub/pipeline/session-identifiers.js';
+import { buildRequestMetadata, cloneClientHeaders, decorateMetadataForAttempt, ensureClientHeadersOnPayload, resolveClientRequestId } from './executor-metadata.js';
+import { ensureHubPipeline, runHubPipeline } from './executor-pipeline.js';
+import { describeRetryReason, shouldRetryProviderError } from './executor-provider.js';
 import { convertProviderResponse as bridgeConvertProviderResponse, createSnapshotRecorder as bridgeCreateSnapshotRecorder } from '../../../modules/llmswitch/bridge.js';
+const MAX_PROVIDER_ATTEMPTS = 3;
 export class HubRequestExecutor {
     deps;
-    static MAX_PROVIDER_ATTEMPTS = 3;
     constructor(deps) {
         this.deps = deps;
     }
@@ -24,11 +26,11 @@ export class HubRequestExecutor {
             statsRecorded = true;
         };
         try {
-            const hubPipeline = this.ensureHubPipeline();
-            const initialMetadata = this.buildRequestMetadata(input);
-            const inboundClientHeaders = this.cloneClientHeaders(initialMetadata?.clientHeaders);
+            const hubPipeline = ensureHubPipeline(this.deps.getHubPipeline);
+            const initialMetadata = buildRequestMetadata(input);
+            const inboundClientHeaders = cloneClientHeaders(initialMetadata?.clientHeaders);
             const providerRequestId = input.requestId;
-            const clientRequestId = this.resolveClientRequestId(initialMetadata, providerRequestId);
+            const clientRequestId = resolveClientRequestId(initialMetadata, providerRequestId);
             this.logStage('request.received', providerRequestId, {
                 endpoint: input.entryEndpoint,
                 stream: initialMetadata.stream === true
@@ -54,25 +56,29 @@ export class HubRequestExecutor {
                 /* snapshot failure should not block request path */
             }
             const pipelineLabel = 'hub';
-            let iterationMetadata = initialMetadata;
-            const disabledProviderAliases = new Set();
             let aggregatedUsage;
+            const excludedProviderKeys = new Set();
+            const maxAttempts = MAX_PROVIDER_ATTEMPTS;
+            const originalRequestSnapshot = this.cloneRequestPayload(input.body);
             let attempt = 0;
-            while (attempt < HubRequestExecutor.MAX_PROVIDER_ATTEMPTS) {
+            let lastError;
+            while (attempt < maxAttempts) {
                 attempt += 1;
-                const metadataForAttempt = this.prepareMetadataForAttempt(iterationMetadata, disabledProviderAliases);
+                const metadataForAttempt = decorateMetadataForAttempt(initialMetadata, attempt, excludedProviderKeys);
+                const clientHeadersForAttempt = cloneClientHeaders(metadataForAttempt?.clientHeaders) || inboundClientHeaders;
+                if (clientHeadersForAttempt) {
+                    metadataForAttempt.clientHeaders = clientHeadersForAttempt;
+                }
+                metadataForAttempt.clientRequestId = clientRequestId;
                 this.logStage(`${pipelineLabel}.start`, providerRequestId, {
                     endpoint: input.entryEndpoint,
                     stream: metadataForAttempt.stream,
                     attempt
                 });
-                // 获取原始请求快照，用于后续响应转换（不包含任何 server-side 工具语义）。
-                const originalRequestSnapshot = this.cloneRequestPayload(input.body);
-                const pipelineResult = await this.runHubPipeline(hubPipeline, input, metadataForAttempt);
+                const pipelineResult = await runHubPipeline(hubPipeline, input, metadataForAttempt);
                 const pipelineMetadata = pipelineResult.metadata ?? {};
                 const mergedMetadata = { ...metadataForAttempt, ...pipelineMetadata };
-                iterationMetadata = mergedMetadata;
-                const mergedClientHeaders = this.cloneClientHeaders(mergedMetadata?.clientHeaders) || inboundClientHeaders;
+                const mergedClientHeaders = cloneClientHeaders(mergedMetadata?.clientHeaders) || clientHeadersForAttempt;
                 if (mergedClientHeaders) {
                     mergedMetadata.clientHeaders = mergedClientHeaders;
                 }
@@ -128,11 +134,10 @@ export class HubRequestExecutor {
                 if (enhancedRequestId !== input.requestId) {
                     input.requestId = enhancedRequestId;
                 }
-                mergedMetadata.clientRequestId = clientRequestId;
                 const providerModel = rawModel;
                 const providerLabel = this.buildProviderLabel(target.providerKey, providerModel);
-                if (inboundClientHeaders) {
-                    this.ensureClientHeadersOnPayload(providerPayload, inboundClientHeaders);
+                if (clientHeadersForAttempt) {
+                    ensureClientHeadersOnPayload(providerPayload, clientHeadersForAttempt);
                 }
                 this.deps.stats.bindProvider(input.requestId, {
                     providerKey: target.providerKey,
@@ -236,231 +241,31 @@ export class HubRequestExecutor {
                         runtime: runtimeMetadata,
                         dependencies: this.deps.getModuleDependencies()
                     });
-                    const retryDecision = this.shouldRetryProviderError(error);
-                    if (retryDecision.retryable && attempt < HubRequestExecutor.MAX_PROVIDER_ATTEMPTS) {
-                        const aliasKey = this.extractProviderAliasKey(target.providerKey);
-                        if (aliasKey) {
-                            disabledProviderAliases.add(aliasKey);
-                        }
-                        iterationMetadata = {
-                            ...mergedMetadata,
-                            disabledProviderKeyAliases: Array.from(disabledProviderAliases)
-                        };
-                        this.logStage('provider.failover', input.requestId, {
-                            providerKey: target.providerKey,
-                            alias: aliasKey,
-                            status: retryDecision.statusCode,
-                            attempt,
-                            nextAttempt: attempt + 1
-                        });
-                        continue;
+                    lastError = error;
+                    const shouldRetry = attempt < maxAttempts && shouldRetryProviderError(error);
+                    if (!shouldRetry) {
+                        throw error;
+                    }
+                    if (target.providerKey) {
+                        excludedProviderKeys.add(target.providerKey);
                     }
-                    throw error;
+                    this.logStage('provider.retry', input.requestId, {
+                        providerKey: target.providerKey,
+                        attempt,
+                        nextAttempt: attempt + 1,
+                        excluded: Array.from(excludedProviderKeys),
+                        reason: describeRetryReason(error)
+                    });
+                    continue;
                 }
             }
-            throw new Error('Provider routing aborted');
+            throw lastError ?? new Error('Provider execution failed without response');
         }
         catch (error) {
             finalizeStats({ error: true });
             throw error;
         }
     }
-    ensureHubPipeline() {
-        const pipeline = this.deps.getHubPipeline();
-        if (!pipeline) {
-            throw new Error('Hub pipeline runtime is not initialized');
-        }
-        return pipeline;
-    }
-    prepareMetadataForAttempt(baseMetadata, disabledAliases) {
-        if (disabledAliases.size === 0) {
-            return { ...baseMetadata };
-        }
-        return {
-            ...baseMetadata,
-            disabledProviderKeyAliases: Array.from(disabledAliases)
-        };
-    }
-    extractProviderAliasKey(providerKey) {
-        if (!providerKey) {
-            return null;
-        }
-        const parts = providerKey.split('.');
-        if (parts.length < 2) {
-            return null;
-        }
-        const normalizedAlias = this.normalizeAliasDescriptor(parts[1]);
-        return `${parts[0]}.${normalizedAlias}`;
-    }
-    normalizeAliasDescriptor(alias) {
-        if (/^\d+-/.test(alias)) {
-            return alias.replace(/^\d+-/, '');
-        }
-        return alias;
-    }
-    shouldRetryProviderError(error) {
-        if (!error || typeof error !== 'object') {
-            return { retryable: false };
-        }
-        const candidate = error;
-        const statusCode = this.extractErrorStatusCode(candidate);
-        if (candidate.retryable === true) {
-            return { retryable: true, statusCode };
-        }
-        if (statusCode === 429) {
-            return { retryable: true, statusCode };
-        }
-        return { retryable: false, statusCode };
-    }
-    extractErrorStatusCode(error) {
-        if (typeof error.status === 'number') {
-            return error.status;
-        }
-        if (typeof error.statusCode === 'number') {
-            return error.statusCode;
-        }
-        if (error.response && typeof error.response.status === 'number') {
-            return error.response.status;
-        }
-        const responseData = error.response?.data?.error
-            ?.status;
-        if (typeof responseData === 'number') {
-            return responseData;
-        }
-        if (typeof error.message === 'string') {
-            const match = error.message.match(/HTTP\s+(\d{3})/i);
-            if (match) {
-                const parsed = Number.parseInt(match[1], 10);
-                if (!Number.isNaN(parsed)) {
-                    return parsed;
-                }
-            }
-        }
-        return undefined;
-    }
-    async runHubPipeline(hubPipeline, input, metadata) {
-        const payload = asRecord(input.body);
-        const pipelineInput = {
-            ...input,
-            id: input.requestId,
-            endpoint: input.entryEndpoint,
-            metadata,
-            payload
-        };
-        const result = await hubPipeline.execute(pipelineInput);
-        if (!result.providerPayload || !result.target?.providerKey) {
-            throw Object.assign(new Error('Virtual router did not produce a provider target'), {
-                code: 'ERR_NO_PROVIDER_TARGET',
-                requestId: input.requestId
-            });
-        }
-        const processMode = result.metadata?.processMode ?? 'chat';
-        return {
-            providerPayload: result.providerPayload,
-            target: result.target,
-            routingDecision: result.routingDecision ?? undefined,
-            processMode,
-            metadata: result.metadata ?? {}
-        };
-    }
-    cloneClientHeaders(source) {
-        if (!source || typeof source !== 'object') {
-            return undefined;
-        }
-        const normalized = {};
-        for (const [key, value] of Object.entries(source)) {
-            if (typeof value === 'string' && value.trim()) {
-                normalized[key] = value;
-            }
-        }
-        return Object.keys(normalized).length ? normalized : undefined;
-    }
-    ensureClientHeadersOnPayload(payload, headers) {
-        if (!payload || typeof payload !== 'object') {
-            return;
-        }
-        const carrier = payload;
-        const existing = carrier.metadata && typeof carrier.metadata === 'object'
-            ? carrier.metadata
-            : {};
-        carrier.metadata = {
-            ...existing,
-            clientHeaders: existing.clientHeaders ?? headers
-        };
-    }
-    resolveClientRequestId(metadata, fallback) {
-        const clientRequestId = typeof metadata.clientRequestId === 'string' && metadata.clientRequestId.trim()
-            ? metadata.clientRequestId.trim()
-            : undefined;
-        return clientRequestId || fallback;
-    }
-    buildRequestMetadata(input) {
-        const userMeta = asRecord(input.metadata);
-        const headers = asRecord(input.headers);
-        const inboundUserAgent = this.extractHeaderValue(headers, 'user-agent');
-        const inboundOriginator = this.extractHeaderValue(headers, 'originator');
-        const normalizedClientHeaders = this.cloneClientHeaders(userMeta.clientHeaders) ||
-            this.cloneClientHeaders(headers?.['clientHeaders'] ?? undefined);
-        const resolvedUserAgent = typeof userMeta.userAgent === 'string' && userMeta.userAgent.trim()
-            ? userMeta.userAgent.trim()
-            : inboundUserAgent;
-        const resolvedOriginator = typeof userMeta.clientOriginator === 'string' && userMeta.clientOriginator.trim()
-            ? userMeta.clientOriginator.trim()
-            : inboundOriginator;
-        const routeHint = this.extractRouteHint(input) ?? userMeta.routeHint;
-        const processMode = userMeta.processMode || 'chat';
-        const metadata = {
-            ...userMeta,
-            entryEndpoint: input.entryEndpoint,
-            processMode,
-            direction: 'request',
-            stage: 'inbound',
-            routeHint,
-            stream: userMeta.stream === true,
-            ...(resolvedUserAgent ? { userAgent: resolvedUserAgent } : {}),
-            ...(resolvedOriginator ? { clientOriginator: resolvedOriginator } : {})
-        };
-        if (normalizedClientHeaders) {
-            metadata.clientHeaders = normalizedClientHeaders;
-        }
-        const sessionIdentifiers = extractSessionIdentifiersFromMetadata(metadata);
-        if (sessionIdentifiers.sessionId) {
-            metadata.sessionId = sessionIdentifiers.sessionId;
-        }
-        if (sessionIdentifiers.conversationId) {
-            metadata.conversationId = sessionIdentifiers.conversationId;
-        }
-        return metadata;
-    }
-    extractHeaderValue(headers, name) {
-        if (!headers) {
-            return undefined;
-        }
-        const target = name.toLowerCase();
-        for (const [key, value] of Object.entries(headers)) {
-            if (key.toLowerCase() !== target) {
-                continue;
-            }
-            if (typeof value === 'string') {
-                return value.trim() || undefined;
-            }
-            if (Array.isArray(value) && value.length) {
-                return String(value[0]).trim() || undefined;
-            }
-            return undefined;
-        }
-        return undefined;
-    }
-    extractRouteHint(input) {
-        const header = input.headers?.['x-route-hint'];
-        if (typeof header === 'string' && header.trim()) {
-            return header.trim();
-        }
-        if (Array.isArray(header) && header[0]) {
-            return String(header[0]);
-        }
-        return undefined;
-    }
     extractResponseStatus(response) {
         if (!response || typeof response !== 'object') {
             return undefined;
@@ -776,279 +581,6 @@ export class HubRequestExecutor {
         merged.total_tokens = total || undefined;
         return merged;
     }
-    buildVisionFollowupPayload(options) {
-        const { originalPayload, visionResponse } = options;
-        if (!originalPayload || typeof originalPayload !== 'object') {
-            return null;
-        }
-        const clone = this.cloneRequestPayload(originalPayload) ?? { ...originalPayload };
-        if (!clone) {
-            return null;
-        }
-        const visionText = this.extractVisionDescription(visionResponse?.body);
-        if (!visionText) {
-            return null;
-        }
-        if (this.rewriteResponsesInput(clone, visionText)) {
-            return clone;
-        }
-        if (this.rewriteChatMessages(clone, visionText)) {
-            return clone;
-        }
-        return null;
-    }
-    rewriteResponsesInput(payload, visionText) {
-        const inputList = payload.input;
-        if (!Array.isArray(inputList)) {
-            return false;
-        }
-        for (let i = inputList.length - 1; i >= 0; i -= 1) {
-            const item = inputList[i];
-            if (!item || typeof item !== 'object') {
-                continue;
-            }
-            const role = typeof item.role === 'string'
-                ? item.role
-                : '';
-            if (role !== 'user') {
-                continue;
-            }
-            const contentBlocks = Array.isArray(item.content)
-                ? [...item.content]
-                : [];
-            const originalText = this.extractTextFromContentBlocks(contentBlocks, ['input_text', 'text']);
-            const textType = this.detectContentTextType(contentBlocks, 'input_text');
-            const composed = this.composeVisionUserText(visionText, originalText);
-            item.content = [
-                {
-                    type: textType,
-                    text: composed
-                }
-            ];
-            inputList[i] = item;
-            return true;
-        }
-        return false;
-    }
-    rewriteChatMessages(payload, visionText) {
-        const messages = payload.messages;
-        if (!Array.isArray(messages)) {
-            return false;
-        }
-        for (let i = messages.length - 1; i >= 0; i -= 1) {
-            const message = messages[i];
-            if (!message || typeof message !== 'object') {
-                continue;
-            }
-            const role = typeof message.role === 'string'
-                ? message.role
-                : '';
-            if (role !== 'user') {
-                continue;
-            }
-            const contentBlocks = Array.isArray(message.content)
-                ? [...message.content]
-                : [];
-            const originalText = this.extractTextFromContentBlocks(contentBlocks, ['text']);
-            const textType = this.detectContentTextType(contentBlocks, 'text');
-            const composed = this.composeVisionUserText(visionText, originalText);
-            message.content = [
-                {
-                    type: textType,
-                    text: composed
-                }
-            ];
-            messages[i] = message;
-            return true;
-        }
-        return false;
-    }
-    extractTextFromContentBlocks(content, allowedTypes) {
-        if (typeof content === 'string') {
-            return content;
-        }
-        if (!Array.isArray(content)) {
-            return '';
-        }
-        const collected = [];
-        for (const block of content) {
-            if (!block || typeof block !== 'object') {
-                continue;
-            }
-            const typeValue = typeof block.type === 'string'
-                ? block.type
-                : '';
-            if (allowedTypes.length && !allowedTypes.includes(typeValue)) {
-                continue;
-            }
-            const textValue = block.text;
-            if (typeof textValue === 'string' && textValue.trim()) {
-                collected.push(textValue.trim());
-            }
-        }
-        return collected.join('\n');
-    }
-    detectContentTextType(content, fallback) {
-        if (Array.isArray(content)) {
-            for (const block of content) {
-                if (!block || typeof block !== 'object') {
-                    continue;
-                }
-                const typeValue = block.type;
-                if (typeof typeValue === 'string' && (typeValue === 'text' || typeValue === 'input_text')) {
-                    return typeValue;
-                }
-            }
-        }
-        return fallback;
-    }
-    composeVisionUserText(visionText, originalText) {
-        const sections = [];
-        const cleanedVision = (visionText || '').trim();
-        if (cleanedVision) {
-            sections.push(`【图片分析】\n${cleanedVision}`);
-        }
-        const cleanedOriginal = (originalText || '').trim();
-        if (cleanedOriginal) {
-            sections.push(`【用户原始请求】\n${cleanedOriginal}`);
-        }
-        return sections.join('\n\n');
-    }
-    extractVisionDescription(body) {
-        if (!body) {
-            return null;
-        }
-        if (typeof body === 'string') {
-            const trimmed = body.trim();
-            return trimmed.length ? trimmed : null;
-        }
-        if (typeof body !== 'object') {
-            return null;
-        }
-        const record = body;
-        const direct = this.extractTextCandidate(record);
-        if (direct) {
-            return direct;
-        }
-        if (record.response && typeof record.response === 'object') {
-            const responseNode = record.response;
-            const nested = this.extractTextCandidate(responseNode);
-            if (nested) {
-                return nested;
-            }
-            const output = responseNode.output;
-            if (Array.isArray(output)) {
-                for (const entry of output) {
-                    if (entry && typeof entry === 'object') {
-                        const nestedText = this.extractTextCandidate(entry);
-                        if (nestedText) {
-                            return nestedText;
-                        }
-                    }
-                }
-            }
-        }
-        if (Array.isArray(record.output)) {
-            for (const entry of record.output) {
-                if (entry && typeof entry === 'object') {
-                    const nested = this.extractTextCandidate(entry);
-                    if (nested) {
-                        return nested;
-                    }
-                }
-            }
-        }
-        const choices = record.choices;
-        if (Array.isArray(choices)) {
-            for (const choice of choices) {
-                if (!choice || typeof choice !== 'object') {
-                    continue;
-                }
-                const message = choice.message;
-                if (message && typeof message === 'object') {
-                    const msg = message;
-                    const content = msg.content;
-                    if (typeof content === 'string' && content.trim()) {
-                        return content.trim();
-                    }
-                    if (Array.isArray(content)) {
-                        for (const part of content) {
-                            if (part && typeof part === 'object' && typeof part.text === 'string') {
-                                const textValue = part.text.trim();
-                                if (textValue) {
-                                    return textValue;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return null;
-    }
-    extractTextCandidate(record) {
-        const candidates = [
-            { key: 'output_text', allowJson: true },
-            { key: 'text' },
-            { key: 'content' }
-        ];
-        for (const candidate of candidates) {
-            if (!(candidate.key in record)) {
-                continue;
-            }
-            const text = this.normalizeTextCandidateValue(record[candidate.key], candidate.allowJson === true);
-            if (text) {
-                return text;
-            }
-        }
-        return null;
-    }
-    normalizeTextCandidateValue(value, allowJsonStringify = false) {
-        if (!value) {
-            return null;
-        }
-        if (typeof value === 'string') {
-            const trimmed = value.trim();
-            return trimmed.length ? trimmed : null;
-        }
-        if (Array.isArray(value)) {
-            const collected = [];
-            for (const entry of value) {
-                const nested = this.normalizeTextCandidateValue(entry, allowJsonStringify);
-                if (nested) {
-                    collected.push(nested);
-                }
-            }
-            return collected.length ? collected.join('\n') : null;
-        }
-        if (typeof value === 'object') {
-            const bag = value;
-            const textField = bag.text;
-            if (typeof textField === 'string' && textField.trim()) {
-                return textField.trim();
-            }
-            const summaryField = bag.summary;
-            if (typeof summaryField === 'string' && summaryField.trim()) {
-                return summaryField.trim();
-            }
-            if ('content' in bag) {
-                const nested = this.normalizeTextCandidateValue(bag.content, allowJsonStringify);
-                if (nested) {
-                    return nested;
-                }
-            }
-            if (allowJsonStringify) {
-                try {
-                    const serialized = JSON.stringify(value, null, 2);
-                    return serialized.trim() || null;
-                }
-                catch {
-                    return null;
-                }
-            }
-        }
-        return null;
-    }
 }
 export function createRequestExecutor(deps) {
     return new HubRequestExecutor(deps);