HTTP: Use Nette HttpRequest for detect baseUri.

composer.json

@@ -12,7 +12,8 @@
 		"php": ">=7.1.0",
 		"ext-json": "*",
 		"nette/di": "^3.0",
-		"nette/utils": "^3.0"
+		"nette/utils": "^3.0",
+		"nette/http": "^3.0"
 	},
 	"autoload": {
 		"classmap": [

src/ApiExtension.php

@@ -18,9 +18,9 @@ class ApiExtension extends CompilerExtension
 	public function afterCompile(ClassType $class): void
 	{
 		$class->getMethod('initialize')->addBody(
-			'if (strncmp(' . Helpers::class . '::processPath(), \'api/\', 4) === 0) {'
-			. "\n\t" . '$this->getByType(' . Application::class . '::class)->onStartup[] = function(' . Application::class . ' $a) {'
-			. "\n\t\t" . '$this->getByType(\'' . ApiManager::class . '\')->run();'
+			'if (strncmp($structuredApi__basePath = ' . Helpers::class . '::processPath($this->getService(\'http.request\')), \'api/\', 4) === 0) {'
+			. "\n\t" . '$this->getByType(' . Application::class . '::class)->onStartup[] = function(' . Application::class . ' $a) use ($structuredApi__basePath) {'
+			. "\n\t\t" . '$this->getByType(\'' . ApiManager::class . '\')->run($structuredApi__basePath);'
 			. "\n\t" . '};'
 			. "\n" . '}'
 		);

src/ApiManager.php

@@ -46,16 +46,16 @@ public function __construct(array $namespaceConventions, Container $container)
 	/**
 	 * By given inputs or current URL route specific API endpoint and send full HTTP response.
 	 *
-	 * @param string|null $path
+	 * @param string $path
 	 * @param mixed[]|null $params
 	 * @param string|null $method
 	 * @throws StructuredApiException
 	 */
-	public function run(?string $path = null, ?array $params = [], ?string $method = null): void
+	public function run(string $path, ?array $params = [], ?string $method = null): void
 	{
 		$params = array_merge($_GET, $params ?? []);
 
-		if (preg_match('/^api\/v([^\/]+)\/?(.*?)$/', $path = $path ?? Helpers::processPath(), $pathParser)) {
+		if (preg_match('/^api\/v([^\/]+)\/?(.*?)$/', $path, $pathParser)) {
 			if (($version = (int) $pathParser[1]) < 1 || $version > 999 || !preg_match('#^[+-]?\d+$#D', $pathParser[1])) {
 				StructuredApiException::invalidVersion($pathParser[1]);
 			}

src/Helpers.php

@@ -5,6 +5,8 @@
 namespace Baraja\StructuredApi;
 
 
+use Nette\Http\Request;
+
 final class Helpers
 {
 
@@ -21,21 +23,12 @@ public function __construct()
 	 * Return current API path by current HTTP URL.
 	 * In case of CLI return empty string.
 	 *
+	 * @param Request $httpRequest
 	 * @return string
 	 */
-	public static function processPath(): string
+	public static function processPath(Request $httpRequest): string
 	{
-		static $return;
-
-		if (($currentUrl = self::getCurrentUrl()) !== null) {
-			if (preg_match('/^(?:https?:\/\/.+)\/www\/?(.*)$/', $currentUrl, $localUrlParser)) {
-				$return = $localUrlParser[1];
-			} elseif (preg_match('/^(?:https?:\/\/[^\/]+)(.*?)$/', $currentUrl, $publicUrlParser)) {
-				$return = $publicUrlParser[1];
-			}
-		}
-
-		return $return !== null ? trim($return, '/') : '';
+		return trim(str_replace(rtrim($httpRequest->getUrl()->withoutUserInfo()->getBaseUrl(), '/'), '', (string) self::getCurrentUrl()), '/');
 	}
 
 	/**