Skip to content

Fix/improve baseurl swagger #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2025
Merged

Fix/improve baseurl swagger #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60f30a1
fix(swagger): improve relative server URL handling by inferring domai…
kargnas Aug 8, 2025
b70e2f1
Fix styling
kargnas Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Console/Commands/MakeSwaggerMcpToolCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,19 @@ protected function loadSpec(): void
$info = $this->parser->getInfo();

$this->info('✅ Spec loaded successfully!');

// Add notice if base URL was inferred from source
$baseUrlDisplay = $info['baseUrl'] ?? 'Not specified';
if ($info['baseUrl'] && str_contains($source, '://') && ! str_contains($info['originalServerUrl'] ?? '', '://')) {
$baseUrlDisplay .= ' (inferred from source URL)';
}

$this->table(
['Property', 'Value'],
[
['Title', $info['title']],
['Version', $info['version']],
['Base URL', $info['baseUrl'] ?? 'Not specified'],
['Base URL', $baseUrlDisplay],
['Total Endpoints', $info['totalEndpoints']],
['Tags', implode(', ', $info['tags'])],
['Security', implode(', ', $info['securitySchemes'])],
Expand Down
56 changes: 55 additions & 1 deletion src/Services/SwaggerParser/SwaggerParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ class SwaggerParser

protected ?string $baseUrl = null;

protected ?string $sourceUrl = null;

protected ?string $originalServerUrl = null;

protected array $securitySchemes = [];

protected array $endpoints = [];
Expand Down Expand Up @@ -65,6 +69,9 @@ public function load(string $source): self
*/
protected function loadFromUrl(string $url): void
{
// Store the source URL for later use
$this->sourceUrl = $url;

$response = Http::get($url);

if (! $response->successful()) {
Expand Down Expand Up @@ -145,7 +152,43 @@ protected function extractBaseUrl(): void
if (Str::startsWith($this->version, 'openapi-')) {
// OpenAPI 3.x
if (isset($this->spec['servers'][0]['url'])) {
$this->baseUrl = $this->spec['servers'][0]['url'];
$serverUrl = $this->spec['servers'][0]['url'];

// Store original server URL for debugging
$this->originalServerUrl = $serverUrl;

// Check if the server URL is relative (doesn't start with http:// or https://)
if (! preg_match('/^https?:\/\//', $serverUrl)) {
// If we have a source URL, extract its domain
if ($this->sourceUrl) {
$parsedUrl = parse_url($this->sourceUrl);
$scheme = $parsedUrl['scheme'] ?? 'https';
$host = $parsedUrl['host'] ?? '';
$port = isset($parsedUrl['port']) ? ":{$parsedUrl['port']}" : '';

if ($host) {
// Build the base URL using the source domain
$baseHost = "{$scheme}://{$host}{$port}";

// If server URL starts with /, it's absolute from root
if (str_starts_with($serverUrl, '/')) {
$this->baseUrl = $baseHost.$serverUrl;
} else {
// Otherwise, it's relative to the spec file location
$this->baseUrl = $baseHost.'/'.ltrim($serverUrl, '/');
}
} else {
// Fallback to the server URL as-is
$this->baseUrl = $serverUrl;
}
} else {
// No source URL available, use as-is
$this->baseUrl = $serverUrl;
}
} else {
// Server URL is already absolute
$this->baseUrl = $serverUrl;
}
}
} else {
// Swagger 2.0
Expand All @@ -155,6 +198,16 @@ protected function extractBaseUrl(): void

if ($host) {
$this->baseUrl = "{$scheme}://{$host}{$basePath}";
} elseif ($this->sourceUrl) {
// No host specified in spec, try to use source URL's host
$parsedUrl = parse_url($this->sourceUrl);
$sourceScheme = $parsedUrl['scheme'] ?? $scheme;
$sourceHost = $parsedUrl['host'] ?? '';
$port = isset($parsedUrl['port']) ? ":{$parsedUrl['port']}" : '';

if ($sourceHost) {
$this->baseUrl = "{$sourceScheme}://{$sourceHost}{$port}{$basePath}";
}
}
}
}
Expand Down Expand Up @@ -357,6 +410,7 @@ public function getInfo(): array
'title' => $this->spec['info']['title'] ?? 'Unknown',
'description' => $this->spec['info']['description'] ?? '',
'baseUrl' => $this->baseUrl,
'originalServerUrl' => $this->originalServerUrl,
'securitySchemes' => array_keys($this->securitySchemes),
'totalEndpoints' => count($this->endpoints),
'tags' => $this->getTags(),
Expand Down
Loading