refactor: Split OpenRouter provider to bring files under 300-line cap
Extracted credential validation, request building, response parsing, and configuration helpers from the 464-line OpenRouter provider into separate, focused classes. This follows the pattern established by the Cloudflare image provider and brings all files under the project's 300-line limit. Files created: - class-open-router-validator.php (152 lines): Handles credential validation with HTTP probes and diagnostic messaging. Delegates from the provider. - class-open-router-config.php (84 lines): Centralizes admin config resolution for API base URL and cache TTL settings. Used by both provider and validator. - class-open-router-request-builder.php (79 lines): Encapsulates request header building and cURL auth filter registration for hosting environments that strip Authorization headers. - class-open-router-response-parser.php (87 lines): Handles response parsing, error classification, and retry-decision logic. - Tests: OpenRouterValidatorTest.php with comprehensive credential checks. Provider shrinks from 464 to 278 lines. All classes are under 300 lines. Dependencies remain clean: validator and config are independent, request-builder and response-parser have no circular imports. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
79
includes/providers/class-open-router-request-builder.php
Normal file
79
includes/providers/class-open-router-request-builder.php
Normal file
@@ -0,0 +1,79 @@
|
||||
<?php
|
||||
declare(strict_types=1);
|
||||
|
||||
/**
|
||||
* Request builder for OpenRouter API calls.
|
||||
*
|
||||
* Encapsulates the logic for building HTTP request headers, including
|
||||
* Cloudflare AI Gateway caching directives and belt-and-suspenders
|
||||
* cURL header injection to work around authorization header stripping
|
||||
* in certain hosting environments.
|
||||
*
|
||||
* Triggered by: PRAutoBlogger_OpenRouter_Provider::send_chat_completion()
|
||||
* Dependencies: add_action(), curl_setopt() (via http_api_curl filter).
|
||||
*
|
||||
* @see class-open-router-provider.php — Parent class that uses this builder.
|
||||
*/
|
||||
class PRAutoBlogger_OpenRouter_Request_Builder {
|
||||
|
||||
/**
|
||||
* Build request headers for OpenRouter API call.
|
||||
*
|
||||
* Includes Authorization, Content-Type, HTTP-Referer, and optional
|
||||
* Cloudflare AI Gateway cache control headers.
|
||||
*
|
||||
* @param string $api_key Decrypted OpenRouter API key.
|
||||
* @param bool $via_gateway Whether the request is routed through Cloudflare AI Gateway.
|
||||
* @param int $cache_ttl Cache TTL in seconds (0 disables caching).
|
||||
*
|
||||
* @return array<string, string> HTTP headers ready for wp_remote_post().
|
||||
*/
|
||||
public function build_headers( string $api_key, bool $via_gateway, int $cache_ttl ): array {
|
||||
$headers = [
|
||||
'Authorization' => 'Bearer ' . $api_key,
|
||||
'Content-Type' => 'application/json',
|
||||
'HTTP-Referer' => home_url(),
|
||||
'X-Title' => 'PRAutoBlogger WordPress Plugin',
|
||||
];
|
||||
|
||||
if ( $via_gateway && $cache_ttl > 0 ) {
|
||||
$headers['cf-aig-cache-ttl'] = (string) $cache_ttl;
|
||||
}
|
||||
|
||||
return $headers;
|
||||
}
|
||||
|
||||
/**
|
||||
* Register a cURL filter to inject Authorization header.
|
||||
*
|
||||
* Some hosting environments (Hostinger, certain proxies) strip the
|
||||
* Authorization header from wp_remote_post's 'headers' array before
|
||||
* the request is sent. The http_api_curl action fires after WordPress
|
||||
* configures the cURL handle but before curl_exec — setting
|
||||
* CURLOPT_HTTPHEADER here ensures the header reaches the upstream.
|
||||
*
|
||||
* Side effects: Adds an http_api_curl filter (caller must remove).
|
||||
*
|
||||
* @param array $request_headers Request headers (includes Authorization).
|
||||
* @param string $base_host Upstream host (scopes the filter to avoid leaking auth).
|
||||
*
|
||||
* @return callable The filter function (for later removal via remove_action).
|
||||
*/
|
||||
public function register_curl_auth_filter( array $request_headers, string $base_host ): callable {
|
||||
$curl_auth_filter = function ( $handle, $parsed_args, $url ) use ( $request_headers, $base_host ): void {
|
||||
// Scope to the configured upstream host only — never leak auth
|
||||
// into unrelated outbound requests made elsewhere in WordPress.
|
||||
if ( '' === $base_host || false === strpos( (string) $url, $base_host ) ) {
|
||||
return;
|
||||
}
|
||||
$curl_headers = [];
|
||||
foreach ( $request_headers as $name => $value ) {
|
||||
$curl_headers[] = $name . ': ' . $value;
|
||||
}
|
||||
// phpcs:ignore WordPress.WP.AlternativeFunctions.curl_curl_setopt
|
||||
curl_setopt( $handle, CURLOPT_HTTPHEADER, $curl_headers );
|
||||
};
|
||||
add_action( 'http_api_curl', $curl_auth_filter, 99, 3 );
|
||||
return $curl_auth_filter;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user