merge of pull request #36 of org. repository

Author: przedmiot

src/ChromeDevtoolsProtocol/Instance/Launcher.php

@@ -41,16 +41,11 @@ class Launcher
 	private $input;
 
 	/**
-	 * @param int $port If port <= 0, random port number is generated.
-	 * @throws \Exception
+	 * @param int $port If port <= 0, random available port is used.
 	 */
 	public function __construct($port = 0)
 	{
-		if ($port <= 0) {
-			$port = random_int(1024 + 1, 65535);
-		}
-
-		$this->port = $port;
+		$this->port = max(0, $port);
 	}
 
 	/**
@@ -213,6 +208,10 @@ private function launchWithExecutable(ContextInterface $ctx, string $executable,
 		$temporaryUserDataDir = null;
 		if (!$foundUserDataDir) {
 			$temporaryUserDataDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . "chrome-profile-" . $this->port;
+			if ($this->port === 0) {
+				$temporaryUserDataDir .= "-" . bin2hex(random_bytes(8));
+			}
+
 			$fs->mkdir($temporaryUserDataDir);
 			$args[] = "--user-data-dir=" . $temporaryUserDataDir;
 		}
@@ -227,6 +226,16 @@ private function launchWithExecutable(ContextInterface $ctx, string $executable,
 			);
 			$process->start();
 
+			if ($this->port === 0) {
+				$process->waitUntil(function ($type, $buffer)  {
+					if (preg_match('~DevTools listening on ws://.+:(\d+)/devtools~', $buffer, $m)) {
+						$this->port = (int)$m[1];
+						return true;
+					}
+					return false;
+				});
+			}
+
 			$instance = new ProcessInstance($process, $temporaryUserDataDir, $this->port);
 
 			while (true) {