@jsonstudio/rcc 0.89.3 → 0.89.168

package/dist/providers/core/runtime/http-request-executor.d.ts

@@ -0,0 +1,42 @@
+import type { HttpClient } from '../utils/http-client.js';
+import type { UnknownObject } from '../../../types/common-types.js';
+import type { ProviderContext } from '../api/provider-types.js';
+import type { ProviderErrorAugmented } from './provider-error-types.js';
+export type PreparedHttpRequest = {
+    endpoint: string;
+    headers: Record<string, string>;
+    targetUrl: string;
+    body: UnknownObject;
+    entryEndpoint?: string;
+    clientRequestId?: string;
+    wantsSse: boolean;
+};
+export type HttpRequestExecutorDeps = {
+    wantsUpstreamSse(request: UnknownObject, context: ProviderContext): boolean;
+    getEffectiveEndpoint(): string;
+    resolveRequestEndpoint(request: UnknownObject, defaultEndpoint: string): string;
+    buildRequestHeaders(): Promise<Record<string, string>>;
+    finalizeRequestHeaders(headers: Record<string, string>, request: UnknownObject): Promise<Record<string, string>>;
+    applyStreamModeHeaders(headers: Record<string, string>, wantsSse: boolean): Record<string, string>;
+    getEffectiveBaseUrl(): string;
+    buildHttpRequestBody(request: UnknownObject): UnknownObject;
+    prepareSseRequestBody(body: UnknownObject, context: ProviderContext): void;
+    getEntryEndpointFromPayload(request: UnknownObject): string | undefined;
+    getClientRequestIdFromContext(context: ProviderContext): string | undefined;
+    wrapUpstreamSseResponse(stream: NodeJS.ReadableStream, context: ProviderContext): Promise<UnknownObject>;
+    getHttpRetryLimit(): number;
+    shouldRetryHttpError(error: unknown, attempt: number, maxAttempts: number): boolean;
+    delayBeforeHttpRetry(attempt: number): Promise<void>;
+    tryRecoverOAuthAndReplay?(error: unknown, requestInfo: PreparedHttpRequest, processedRequest: UnknownObject, captureSse: boolean, context: ProviderContext): Promise<unknown | undefined>;
+    normalizeHttpError(error: unknown, processedRequest: UnknownObject, requestInfo: PreparedHttpRequest, context: ProviderContext): Promise<ProviderErrorAugmented>;
+};
+export declare class HttpRequestExecutor {
+    private readonly httpClient;
+    private readonly deps;
+    constructor(httpClient: HttpClient, deps: HttpRequestExecutorDeps);
+    execute(processedRequest: UnknownObject, context: ProviderContext): Promise<unknown>;
+    private prepareHttpRequest;
+    private snapshotProviderRequest;
+    private executeHttpRequestWithRetries;
+    private executeHttpRequestOnce;
+}

package/dist/providers/core/runtime/http-request-executor.js

@@ -0,0 +1,133 @@
+import { attachProviderSseSnapshotStream, shouldCaptureProviderStreamSnapshots, writeProviderSnapshot } from '../utils/snapshot-writer.js';
+export class HttpRequestExecutor {
+    httpClient;
+    deps;
+    constructor(httpClient, deps) {
+        this.httpClient = httpClient;
+        this.deps = deps;
+    }
+    async execute(processedRequest, context) {
+        const prepared = await this.prepareHttpRequest(processedRequest, context);
+        await this.snapshotProviderRequest(prepared, context);
+        try {
+            return await this.executeHttpRequestWithRetries(prepared, processedRequest, context);
+        }
+        catch (error) {
+            const normalized = await this.deps.normalizeHttpError(error, processedRequest, prepared, context);
+            throw normalized;
+        }
+    }
+    async prepareHttpRequest(processedRequest, context) {
+        const wantsSse = this.deps.wantsUpstreamSse(processedRequest, context);
+        const defaultEndpoint = this.deps.getEffectiveEndpoint();
+        const endpoint = this.deps.resolveRequestEndpoint(processedRequest, defaultEndpoint);
+        const headers = await this.deps.buildRequestHeaders();
+        let finalHeaders = await this.deps.finalizeRequestHeaders(headers, processedRequest);
+        finalHeaders = this.deps.applyStreamModeHeaders(finalHeaders, wantsSse);
+        const targetUrl = `${this.deps.getEffectiveBaseUrl().replace(/\/$/, '')}/${endpoint.startsWith('/') ? endpoint.slice(1) : endpoint}`;
+        const finalBody = this.deps.buildHttpRequestBody(processedRequest);
+        if (wantsSse) {
+            this.deps.prepareSseRequestBody(finalBody, context);
+        }
+        const entryEndpoint = this.deps.getEntryEndpointFromPayload(processedRequest);
+        const clientRequestId = this.deps.getClientRequestIdFromContext(context);
+        return {
+            endpoint,
+            headers: finalHeaders,
+            targetUrl,
+            body: finalBody,
+            entryEndpoint,
+            clientRequestId,
+            wantsSse
+        };
+    }
+    async snapshotProviderRequest(requestInfo, context) {
+        try {
+            await writeProviderSnapshot({
+                phase: 'provider-request',
+                requestId: context.requestId,
+                data: requestInfo.body,
+                headers: requestInfo.headers,
+                url: requestInfo.targetUrl,
+                entryEndpoint: requestInfo.entryEndpoint,
+                clientRequestId: requestInfo.clientRequestId
+            });
+        }
+        catch {
+            /* ignore snapshot failures */
+        }
+    }
+    async executeHttpRequestWithRetries(requestInfo, processedRequest, context) {
+        const captureSse = shouldCaptureProviderStreamSnapshots();
+        const maxAttempts = this.deps.getHttpRetryLimit();
+        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+            try {
+                return await this.executeHttpRequestOnce(requestInfo, context, captureSse);
+            }
+            catch (error) {
+                if (this.deps.tryRecoverOAuthAndReplay) {
+                    const oauthReplay = await this.deps.tryRecoverOAuthAndReplay(error, requestInfo, processedRequest, captureSse, context);
+                    if (oauthReplay) {
+                        return oauthReplay;
+                    }
+                }
+                const shouldRetry = this.deps.shouldRetryHttpError(error, attempt, maxAttempts);
+                if (shouldRetry) {
+                    await this.deps.delayBeforeHttpRetry(attempt);
+                    continue;
+                }
+                throw error;
+            }
+        }
+        throw new Error('provider-runtime-error: http retries exhausted');
+    }
+    async executeHttpRequestOnce(requestInfo, context, captureSse) {
+        if (requestInfo.wantsSse) {
+            const upstreamStream = await this.httpClient.postStream(requestInfo.endpoint, requestInfo.body, requestInfo.headers);
+            const streamForHost = captureSse
+                ? attachProviderSseSnapshotStream(upstreamStream, {
+                    requestId: context.requestId,
+                    headers: requestInfo.headers,
+                    url: requestInfo.targetUrl,
+                    entryEndpoint: requestInfo.entryEndpoint,
+                    clientRequestId: requestInfo.clientRequestId
+                })
+                : upstreamStream;
+            const wrapped = await this.deps.wrapUpstreamSseResponse(streamForHost, context);
+            if (!captureSse) {
+                try {
+                    await writeProviderSnapshot({
+                        phase: 'provider-response',
+                        requestId: context.requestId,
+                        data: { mode: 'sse' },
+                        headers: requestInfo.headers,
+                        url: requestInfo.targetUrl,
+                        entryEndpoint: requestInfo.entryEndpoint,
+                        clientRequestId: requestInfo.clientRequestId
+                    });
+                }
+                catch {
+                    /* ignore snapshot failures */
+                }
+            }
+            return wrapped;
+        }
+        const response = await this.httpClient.post(requestInfo.endpoint, requestInfo.body, requestInfo.headers);
+        try {
+            await writeProviderSnapshot({
+                phase: 'provider-response',
+                requestId: context.requestId,
+                data: response,
+                headers: requestInfo.headers,
+                url: requestInfo.targetUrl,
+                entryEndpoint: requestInfo.entryEndpoint,
+                clientRequestId: requestInfo.clientRequestId
+            });
+        }
+        catch {
+            /* ignore snapshot failures */
+        }
+        return response;
+    }
+}
+//# sourceMappingURL=http-request-executor.js.map

package/dist/providers/core/runtime/http-request-executor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"http-request-executor.js","sourceRoot":"","sources":["../../../../src/providers/core/runtime/http-request-executor.ts"],"names":[],"mappings":"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"}

package/dist/providers/core/runtime/http-transport-provider.d.ts

@@ -10,7 +10,6 @@
  */
 import { BaseProvider } from './base-provider.js';
 import { HttpClient } from '../utils/http-client.js';
-import { HookSystemIntegration } from '../hooks/hooks-integration.js';
 import type { IAuthProvider } from '../../auth/auth-interface.js';
 import type { OpenAIStandardConfig } from '../api/provider-config.js';
 import type { ProviderContext, ServiceProfile } from '../api/provider-types.js';
@@ -23,8 +22,8 @@ export declare class HttpTransportProvider extends BaseProvider {
     protected authProvider: IAuthProvider | null;
     protected httpClient: HttpClient;
     protected serviceProfile: ServiceProfile;
-    protected hookSystemIntegration: HookSystemIntegration;
     protected protocolClient: ProtocolClient;
+    private requestExecutor;
     private injectedConfig;
     constructor(config: OpenAIStandardConfig, dependencies: ModuleDependencies, moduleType: string, protocolClient?: HttpProtocolClient<ProtocolRequestPayload>);
     /**
@@ -33,17 +32,10 @@ export declare class HttpTransportProvider extends BaseProvider {
     protected onInitialize(): Promise<void>;
     setConfig(cfg: unknown): void;
     getConfig(): unknown;
-    /**
-     * 初始化Hook系统集成
-     */
-    private initializeHookSystem;
-    /**
-     * 配置Hook调试（保持向后兼容）
-     */
-    private configureHookDebugging;
     protected getServiceProfile(): ServiceProfile;
     protected createAuthProvider(): IAuthProvider;
     protected createHttpClient(): void;
+    private createRequestExecutorDeps;
     protected preprocessRequest(request: UnknownObject): Promise<UnknownObject>;
     protected postprocessResponse(response: unknown, context: ProviderContext): Promise<UnknownObject>;
     protected sendRequestInternal(request: UnknownObject): Promise<unknown>;
@@ -52,6 +44,11 @@ export declare class HttpTransportProvider extends BaseProvider {
     protected prepareSseRequestBody(_body: UnknownObject, _context: ProviderContext): void;
     protected wrapUpstreamSseResponse(stream: NodeJS.ReadableStream, _context: ProviderContext): Promise<UnknownObject>;
     protected performHealthCheck(url: string): Promise<boolean>;
+    private getHttpRetryLimit;
+    private delayBeforeHttpRetry;
+    private shouldRetryHttpError;
+    private tryRecoverOAuthAndReplay;
+    private normalizeHttpError;
     /**
      * 为特定请求确定最终 endpoint（默认使用配置值，可由子类覆写）
      */
@@ -71,7 +68,6 @@ export declare class HttpTransportProvider extends BaseProvider {
     protected getEffectiveEndpoint(): string;
     private pickRuntimeBaseUrl;
     private looksLikeAbsoluteUrl;
-    private getHookManager;
     private getConfigExtensions;
     private getEntryEndpointFromPayload;
     private asResponseRecord;